diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> +) : 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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> +) : 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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_change_record.xml b/app/src/main/res/layout/fragment_equipment_change_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_change_record.xml +++ b/app/src/main/res/layout/fragment_equipment_change_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_change_record.xml b/app/src/main/res/layout/fragment_equipment_change_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_change_record.xml +++ b/app/src/main/res/layout/fragment_equipment_change_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ b/app/src/main/res/layout/fragment_equipment_inspection_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_change_record.xml b/app/src/main/res/layout/fragment_equipment_change_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_change_record.xml +++ b/app/src/main/res/layout/fragment_equipment_change_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ b/app/src/main/res/layout/fragment_equipment_inspection_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_usage_record.xml b/app/src/main/res/layout/fragment_equipment_usage_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_usage_record.xml +++ b/app/src/main/res/layout/fragment_equipment_usage_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_change_record.xml b/app/src/main/res/layout/fragment_equipment_change_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_change_record.xml +++ b/app/src/main/res/layout/fragment_equipment_change_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ b/app/src/main/res/layout/fragment_equipment_inspection_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_usage_record.xml b/app/src/main/res/layout/fragment_equipment_usage_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_usage_record.xml +++ b/app/src/main/res/layout/fragment_equipment_usage_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_train_students.xml b/app/src/main/res/layout/fragment_train_students.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_train_students.xml +++ b/app/src/main/res/layout/fragment_train_students.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_change_record.xml b/app/src/main/res/layout/fragment_equipment_change_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_change_record.xml +++ b/app/src/main/res/layout/fragment_equipment_change_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ b/app/src/main/res/layout/fragment_equipment_inspection_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_usage_record.xml b/app/src/main/res/layout/fragment_equipment_usage_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_usage_record.xml +++ b/app/src/main/res/layout/fragment_equipment_usage_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_train_students.xml b/app/src/main/res/layout/fragment_train_students.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_train_students.xml +++ b/app/src/main/res/layout/fragment_train_students.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_device_regulation_rv_l.xml b/app/src/main/res/layout/item_device_regulation_rv_l.xml new file mode 100644 index 0000000..0476679 --- /dev/null +++ b/app/src/main/res/layout/item_device_regulation_rv_l.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt new file mode 100644 index 0000000..749fb91 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/CapabilityListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt deleted file mode 100644 index 6ebd138..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CapabilityListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CapabilityListAdapter( - 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/CustomerAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt new file mode 100644 index 0000000..9f56554 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerAdapter.kt @@ -0,0 +1,55 @@ +package com.casic.xz.meterage.adapter + +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.customerNameView.text = rowsBean.customerName + holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() + holder.overallView.text = rowsBean.evaluationName + holder.scaleView.text = rowsBean.companySizeName + + //绑定事件 + holder.itemView.setOnClickListener { + listener?.onItemClicked(position) + } + } + + inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { + var customerNameView: TextView = view.findViewById(R.id.customerNameView) + var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) + var overallView: TextView = view.findViewById(R.id.overallView) + var scaleView: TextView = view.findViewById(R.id.scaleView) + } + + 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/CustomerListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt deleted file mode 100644 index 6a4407c..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/CustomerListAdapter.kt +++ /dev/null @@ -1,55 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 CustomerListAdapter( - 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.customerNameView.text = rowsBean.customerName - holder.agreementLevelView.text = rowsBean.grade.toChineseGrade() - holder.overallView.text = rowsBean.evaluationName - holder.scaleView.text = rowsBean.companySizeName - - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onItemClicked(position) - } - } - - inner class ItemViewHolder(view: View) : RecyclerView.ViewHolder(view) { - var customerNameView: TextView = view.findViewById(R.id.customerNameView) - var agreementLevelView: TextView = view.findViewById(R.id.agreementLevelView) - var overallView: TextView = view.findViewById(R.id.overallView) - var scaleView: TextView = view.findViewById(R.id.scaleView) - } - - 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/EquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt new file mode 100644 index 0000000..bb47a69 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/EquipmentListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt deleted file mode 100644 index 2ac7ba7..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/EquipmentListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 EquipmentListAdapter( - 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/MeterageTrainAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt new file mode 100644 index 0000000..8347582 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainAdapter.kt @@ -0,0 +1,89 @@ +package com.casic.xz.meterage.adapter + +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/MeterageTrainListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt deleted file mode 100644 index d61a8b0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/MeterageTrainListAdapter.kt +++ /dev/null @@ -1,89 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 MeterageTrainListAdapter( - 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/NoticeAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt new file mode 100644 index 0000000..ab4b8db --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeAdapter.kt @@ -0,0 +1,62 @@ +package com.casic.xz.meterage.adapter + +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/NoticeListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt deleted file mode 100644 index 722e4d1..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/NoticeListAdapter.kt +++ /dev/null @@ -1,62 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 NoticeListAdapter( - 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/StaffAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt new file mode 100644 index 0000000..fa032fb --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StaffAdapter.kt @@ -0,0 +1,40 @@ +package com.casic.xz.meterage.adapter + +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.deptId + "】" + 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/StaffListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt deleted file mode 100644 index 44d2fe0..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StaffListAdapter.kt +++ /dev/null @@ -1,40 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StaffListAdapter( - 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.deptId + "】" + 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/StandardDeviceAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt new file mode 100644 index 0000000..86da08b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceAdapter.kt @@ -0,0 +1,54 @@ +package com.casic.xz.meterage.adapter + +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/StandardDeviceListAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt deleted file mode 100644 index 86f04ed..0000000 --- a/app/src/main/java/com/casic/xz/meterage/adapter/StandardDeviceListAdapter.kt +++ /dev/null @@ -1,54 +0,0 @@ -package com.casic.xz.meterage.adapter - -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 StandardDeviceListAdapter( - 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/SupportEquipmentAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt index a465d56..ffdc9c6 100644 --- a/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt +++ b/app/src/main/java/com/casic/xz/meterage/adapter/SupportEquipmentAdapter.kt @@ -7,10 +7,10 @@ import android.widget.TextView import androidx.recyclerview.widget.RecyclerView import com.casic.xz.meterage.R -import com.casic.xz.meterage.model.SupportEquipmentModel +import com.casic.xz.meterage.model.SupportEquipmentListModel class SupportEquipmentAdapter( - context: Context, private val dataRows: MutableList + context: Context, private val dataRows: MutableList ) : RecyclerView.Adapter() { private var layoutInflater: LayoutInflater = LayoutInflater.from(context) diff --git a/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt new file mode 100644 index 0000000..83168bd --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/adapter/VerifyRegulationAdapter.kt @@ -0,0 +1,44 @@ +package com.casic.xz.meterage.adapter + +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.VerifyRegulationListModel +import com.pengxh.kt.lite.extensions.toJson + +class VerifyRegulationAdapter( + 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_regulation_rv_l, parent, false) + ) + + override fun onBindViewHolder(holder: ItemViewHolder, position: Int) { + //绑定数据 + val rowsBean = dataRows[position] + holder.testView.text = rowsBean.toJson() +// 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 testView: TextView = view.findViewById(R.id.testView) +// 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/HomePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt index b60890d..868d2e5 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/HomePageFragment.kt @@ -19,7 +19,7 @@ override fun initData() { val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt index 82258c5..d969baf 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/MinePageFragment.kt @@ -12,11 +12,7 @@ import com.pengxh.kt.lite.extensions.navigatePageTo import com.pengxh.kt.lite.utils.SaveKeyValues import com.qmuiteam.qmui.util.QMUIDisplayHelper -import kotlinx.android.synthetic.main.fragment_home.* import kotlinx.android.synthetic.main.fragment_mine.* -import kotlinx.android.synthetic.main.fragment_mine.noticeCountView -import kotlinx.android.synthetic.main.fragment_mine.noticeLayout -import kotlinx.android.synthetic.main.fragment_mine.statusBarView class MinePageFragment : KotlinBaseFragment() { @@ -24,7 +20,7 @@ val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) - userViewModel.userInfoResult.observe(this) { + userViewModel.userInfo.observe(this) { if (it.code == 200) { val data = it.data userNameView.text = data.name @@ -40,7 +36,7 @@ val noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList("", "", "", "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val total = it.data.total if (total.toString() == "") { diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt index 7079414..5c7f2eb 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/customer/BasicInformationFragment.kt @@ -25,7 +25,7 @@ override fun initData() { customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] customerViewModel.getCustomerDetail(id) - customerViewModel.customerDetailResult.observe(this) { + customerViewModel.customerDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt index 1c7f943..77846b4 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getStandardDeviceDetail(id) - equipmentViewModel.standardDeviceDetailResult.observe(this) { + equipmentViewModel.standardDeviceDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt index 771e563..e6f654d 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/MeasurementStaffFragment.kt @@ -3,7 +3,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StaffListAdapter +import com.casic.xz.meterage.adapter.StaffAdapter import com.casic.xz.meterage.vm.MeterageStaffViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* @@ -11,18 +11,18 @@ class MeasurementStaffFragment(private val id: String) : KotlinBaseFragment() { private lateinit var staffViewModel: MeterageStaffViewModel - private lateinit var staffListAdapter: StaffListAdapter + private lateinit var staffAdapter: StaffAdapter override fun initData() { staffViewModel = ViewModelProvider(this)[MeterageStaffViewModel::class.java] staffViewModel.getStaffList(id) - staffViewModel.staffResult.observe(this) { + staffViewModel.staffList.observe(this) { if (it.code == 200) { - staffListAdapter = StaffListAdapter(requireContext(), it.data.rows) + staffAdapter = StaffAdapter(requireContext(), it.data.rows) staffRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = staffListAdapter + staffRecyclerView.adapter = staffAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt index c4e9912..d16888c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/SupportEquipmentFragment.kt @@ -6,7 +6,7 @@ import com.casic.xz.meterage.adapter.SupportEquipmentAdapter import com.casic.xz.meterage.vm.EquipmentViewModel import com.pengxh.kt.lite.base.KotlinBaseFragment -import kotlinx.android.synthetic.main.fragment_device_measurement_staff.* +import kotlinx.android.synthetic.main.fragment_device_support_equipment.* class SupportEquipmentFragment(private val id: String) : KotlinBaseFragment() { @@ -15,14 +15,14 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.getSupportEquipment(id) - equipmentViewModel.supportEquipmentResult.observe(this) { + equipmentViewModel.getSupportEquipmentList(id) + equipmentViewModel.supportEquipmentList.observe(this) { if (it.code == 200) { supportEquipmentAdapter = SupportEquipmentAdapter(requireContext(), it.data.rows) - staffRecyclerView.addItemDecoration( + supportRecyclerView.addItemDecoration( DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) ) - staffRecyclerView.adapter = supportEquipmentAdapter + supportRecyclerView.adapter = supportEquipmentAdapter } } } diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt deleted file mode 100644 index 5f02338..0000000 --- a/app/src/main/java/com/casic/xz/meterage/fragment/device/UsageRecordFragment.kt +++ /dev/null @@ -1,24 +0,0 @@ -package com.casic.xz.meterage.fragment.device - -import com.casic.xz.meterage.R -import com.pengxh.kt.lite.base.KotlinBaseFragment - -class UsageRecordFragment : KotlinBaseFragment() { - override fun initData() { - - } - - override fun initEvent() { - - } - - override fun initLayoutView(): Int = R.layout.fragment_device_usage_record - - override fun observeRequestState() { - - } - - override fun setupTopBarLayout() { - - } -} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt new file mode 100644 index 0000000..376455b --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/fragment/device/VerifyRegulationFragment.kt @@ -0,0 +1,43 @@ +package com.casic.xz.meterage.fragment.device + +import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration +import com.casic.xz.meterage.R +import com.casic.xz.meterage.adapter.VerifyRegulationAdapter +import com.casic.xz.meterage.vm.VerifyViewModel +import com.pengxh.kt.lite.base.KotlinBaseFragment +import kotlinx.android.synthetic.main.fragment_device_verify_regulation.* + +class VerifyRegulationFragment(private val id: String) : KotlinBaseFragment() { + + private lateinit var verifyViewModel: VerifyViewModel + private lateinit var regulationAdapter: VerifyRegulationAdapter + + override fun initData() { + verifyViewModel = ViewModelProvider(this)[VerifyViewModel::class.java] + verifyViewModel.getVerifyProcedureList(id) + verifyViewModel.verifyProcedureList.observe(this) { + if (it.code == 200) { + regulationAdapter = VerifyRegulationAdapter(requireContext(), it.data.rows) + regulationRecyclerView.addItemDecoration( + DividerItemDecoration(requireContext(), DividerItemDecoration.VERTICAL) + ) + regulationRecyclerView.adapter = regulationAdapter + } + } + } + + override fun initEvent() { + + } + + override fun initLayoutView(): Int = R.layout.fragment_device_verify_regulation + + override fun observeRequestState() { + + } + + override fun setupTopBarLayout() { + + } +} \ No newline at end of file diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt index cc14ffb..72b523c 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/equipment/BasicInformationFragment.kt @@ -19,7 +19,7 @@ override fun initData() { equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] equipmentViewModel.getEquipmentDetail(id) - equipmentViewModel.equipmentDetailResult.observe(this) { + equipmentViewModel.equipmentDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt index b0f5ff1..f7797a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt +++ b/app/src/main/java/com/casic/xz/meterage/fragment/train/BasicInformationFragment.kt @@ -15,7 +15,7 @@ override fun initData() { meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] meterageTrainViewModel.getMeterageTrainDetail(id) - meterageTrainViewModel.meterageTrainDetailResult.observe(this) { + meterageTrainViewModel.meterageTrainDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java new file mode 100644 index 0000000..b1b498f --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentListModel.java @@ -0,0 +1,211 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class SupportEquipmentListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private int total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public int getTotal() { + return total; + } + + public void setTotal(int total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String equipmentId; + private String equipmentName; + private String equipmentNo; + private String id; + private boolean isDel; + private String mesureDate; + private String mesureRange; + private String mesureResult; + private String mesureResultName; + private String modelNo; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String useDeptName; + private String validDate; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEquipmentId() { + return equipmentId; + } + + public void setEquipmentId(String equipmentId) { + this.equipmentId = equipmentId; + } + + public String getEquipmentName() { + return equipmentName; + } + + public void setEquipmentName(String equipmentName) { + this.equipmentName = equipmentName; + } + + public String getEquipmentNo() { + return equipmentNo; + } + + public void setEquipmentNo(String equipmentNo) { + this.equipmentNo = equipmentNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public boolean isIsDel() { + return isDel; + } + + public void setIsDel(boolean isDel) { + this.isDel = isDel; + } + + public String getMesureDate() { + return mesureDate; + } + + public void setMesureDate(String mesureDate) { + this.mesureDate = mesureDate; + } + + public String getMesureRange() { + return mesureRange; + } + + public void setMesureRange(String mesureRange) { + this.mesureRange = mesureRange; + } + + public String getMesureResult() { + return mesureResult; + } + + public void setMesureResult(String mesureResult) { + this.mesureResult = mesureResult; + } + + public String getMesureResultName() { + return mesureResultName; + } + + public void setMesureResultName(String mesureResultName) { + this.mesureResultName = mesureResultName; + } + + public String getModelNo() { + return modelNo; + } + + public void setModelNo(String modelNo) { + this.modelNo = modelNo; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getUseDeptName() { + return useDeptName; + } + + public void setUseDeptName(String useDeptName) { + this.useDeptName = useDeptName; + } + + public String getValidDate() { + return validDate; + } + + public void setValidDate(String validDate) { + this.validDate = validDate; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java b/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java deleted file mode 100644 index 8da1b81..0000000 --- a/app/src/main/java/com/casic/xz/meterage/model/SupportEquipmentModel.java +++ /dev/null @@ -1,211 +0,0 @@ -package com.casic.xz.meterage.model; - -import java.util.List; - -public class SupportEquipmentModel { - - private int code; - private DataModel data; - private String message; - - public int getCode() { - return code; - } - - public void setCode(int code) { - this.code = code; - } - - public DataModel getData() { - return data; - } - - public void setData(DataModel data) { - this.data = data; - } - - public String getMessage() { - return message; - } - - public void setMessage(String message) { - this.message = message; - } - - public static class DataModel { - private List rows; - private int total; - - public List getRows() { - return rows; - } - - public void setRows(List rows) { - this.rows = rows; - } - - public int getTotal() { - return total; - } - - public void setTotal(int total) { - this.total = total; - } - - public static class RowsModel { - private String createTime; - private String createUser; - private String equipmentId; - private String equipmentName; - private String equipmentNo; - private String id; - private boolean isDel; - private String mesureDate; - private String mesureRange; - private String mesureResult; - private String mesureResultName; - private String modelNo; - private String remark; - private String standardEquipmentId; - private String updateTime; - private String useDeptName; - private String validDate; - - public String getCreateTime() { - return createTime; - } - - public void setCreateTime(String createTime) { - this.createTime = createTime; - } - - public String getCreateUser() { - return createUser; - } - - public void setCreateUser(String createUser) { - this.createUser = createUser; - } - - public String getEquipmentId() { - return equipmentId; - } - - public void setEquipmentId(String equipmentId) { - this.equipmentId = equipmentId; - } - - public String getEquipmentName() { - return equipmentName; - } - - public void setEquipmentName(String equipmentName) { - this.equipmentName = equipmentName; - } - - public String getEquipmentNo() { - return equipmentNo; - } - - public void setEquipmentNo(String equipmentNo) { - this.equipmentNo = equipmentNo; - } - - public String getId() { - return id; - } - - public void setId(String id) { - this.id = id; - } - - public boolean isIsDel() { - return isDel; - } - - public void setIsDel(boolean isDel) { - this.isDel = isDel; - } - - public String getMesureDate() { - return mesureDate; - } - - public void setMesureDate(String mesureDate) { - this.mesureDate = mesureDate; - } - - public String getMesureRange() { - return mesureRange; - } - - public void setMesureRange(String mesureRange) { - this.mesureRange = mesureRange; - } - - public String getMesureResult() { - return mesureResult; - } - - public void setMesureResult(String mesureResult) { - this.mesureResult = mesureResult; - } - - public String getMesureResultName() { - return mesureResultName; - } - - public void setMesureResultName(String mesureResultName) { - this.mesureResultName = mesureResultName; - } - - public String getModelNo() { - return modelNo; - } - - public void setModelNo(String modelNo) { - this.modelNo = modelNo; - } - - public String getRemark() { - return remark; - } - - public void setRemark(String remark) { - this.remark = remark; - } - - public String getStandardEquipmentId() { - return standardEquipmentId; - } - - public void setStandardEquipmentId(String standardEquipmentId) { - this.standardEquipmentId = standardEquipmentId; - } - - public String getUpdateTime() { - return updateTime; - } - - public void setUpdateTime(String updateTime) { - this.updateTime = updateTime; - } - - public String getUseDeptName() { - return useDeptName; - } - - public void setUseDeptName(String useDeptName) { - this.useDeptName = useDeptName; - } - - public String getValidDate() { - return validDate; - } - - public void setValidDate(String validDate) { - this.validDate = validDate; - } - } - } -} diff --git a/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java new file mode 100644 index 0000000..c66d770 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/model/VerifyRegulationListModel.java @@ -0,0 +1,184 @@ +package com.casic.xz.meterage.model; + +import java.util.List; + +public class VerifyRegulationListModel { + + private int code; + private DataModel data; + private String message; + + public int getCode() { + return code; + } + + public void setCode(int code) { + this.code = code; + } + + public DataModel getData() { + return data; + } + + public void setData(DataModel data) { + this.data = data; + } + + public String getMessage() { + return message; + } + + public void setMessage(String message) { + this.message = message; + } + + public static class DataModel { + private List rows; + private String total; + + public List getRows() { + return rows; + } + + public void setRows(List rows) { + this.rows = rows; + } + + public String getTotal() { + return total; + } + + public void setTotal(String total) { + this.total = total; + } + + public static class RowsModel { + private String createTime; + private String createUser; + private String effectiveStatus; + private String effectiveStatusName; + private String effectiveTime; + private String fileCode; + private String fileName; + private String fileNo; + private String id; + private String isDel; + private String remark; + private String standardEquipmentId; + private String updateTime; + private String verifyRegulationId; + + public String getCreateTime() { + return createTime; + } + + public void setCreateTime(String createTime) { + this.createTime = createTime; + } + + public String getCreateUser() { + return createUser; + } + + public void setCreateUser(String createUser) { + this.createUser = createUser; + } + + public String getEffectiveStatus() { + return effectiveStatus; + } + + public void setEffectiveStatus(String effectiveStatus) { + this.effectiveStatus = effectiveStatus; + } + + public String getEffectiveStatusName() { + return effectiveStatusName; + } + + public void setEffectiveStatusName(String effectiveStatusName) { + this.effectiveStatusName = effectiveStatusName; + } + + public String getEffectiveTime() { + return effectiveTime; + } + + public void setEffectiveTime(String effectiveTime) { + this.effectiveTime = effectiveTime; + } + + public String getFileCode() { + return fileCode; + } + + public void setFileCode(String fileCode) { + this.fileCode = fileCode; + } + + public String getFileName() { + return fileName; + } + + public void setFileName(String fileName) { + this.fileName = fileName; + } + + public String getFileNo() { + return fileNo; + } + + public void setFileNo(String fileNo) { + this.fileNo = fileNo; + } + + public String getId() { + return id; + } + + public void setId(String id) { + this.id = id; + } + + public String getIsDel() { + return isDel; + } + + public void setIsDel(String isDel) { + this.isDel = isDel; + } + + public String getRemark() { + return remark; + } + + public void setRemark(String remark) { + this.remark = remark; + } + + public String getStandardEquipmentId() { + return standardEquipmentId; + } + + public void setStandardEquipmentId(String standardEquipmentId) { + this.standardEquipmentId = standardEquipmentId; + } + + public String getUpdateTime() { + return updateTime; + } + + public void setUpdateTime(String updateTime) { + this.updateTime = updateTime; + } + + public String getVerifyRegulationId() { + return verifyRegulationId; + } + + public void setVerifyRegulationId(String verifyRegulationId) { + this.verifyRegulationId = verifyRegulationId; + } + } + } +} diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt index afd5d3b..76d184c 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitService.kt @@ -146,10 +146,19 @@ ): String /** - * 获取计量人员列表 + * 获取标准配套设备列表 */ @POST("/meter/standard/equipment/listPage") - suspend fun getSupportEquipment( + suspend fun getSupportEquipmentList( + @Header("token") token: String, + @Body requestBody: RequestBody + ): String + + /** + * 获取检定规程列表 + */ + @POST("/meter/standard/regulation/listPage") + suspend fun getVerifyProcedureList( @Header("token") token: String, @Body requestBody: RequestBody ): String diff --git a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt index fa74625..d01f129 100644 --- a/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt +++ b/app/src/main/java/com/casic/xz/meterage/utils/retrofit/RetrofitServiceManager.kt @@ -345,12 +345,24 @@ /** * 获取标准配套设备列表 */ - suspend fun getSupportEquipment(id: String): String { + suspend fun getSupportEquipmentList(id: String): String { val paramObject = JSONObject() paramObject.put("id", id) val requestBody = paramObject.toString().toRequestBody( "application/json;charset=UTF-8".toMediaType() ) - return api.getSupportEquipment(AuthenticationHelper.token!!, requestBody) + return api.getSupportEquipmentList(AuthenticationHelper.token!!, requestBody) + } + + /** + * 获取检定规程列表 + */ + suspend fun getVerifyProcedureList(id: String): String { + val paramObject = JSONObject() + paramObject.put("id", id) + val requestBody = paramObject.toString().toRequestBody( + "application/json;charset=UTF-8".toMediaType() + ) + return api.getVerifyProcedureList(AuthenticationHelper.token!!, requestBody) } } \ No newline at end of file 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 6de2dc9..e084ac9 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -113,7 +113,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -122,13 +122,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt index ddc1258..e1ed34d 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CapabilityDetailActivity.kt @@ -21,7 +21,7 @@ capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] capabilityViewModel.getCapabilityDetail(id) - capabilityViewModel.capabilityDetailResult.observe(this) { + capabilityViewModel.capabilityDetail.observe(this) { if (it.code == 200) { val data = it.data!! diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt index 0629f1c..04c3a46 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/CustomerActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -119,7 +119,7 @@ when (it.what) { 2023021301 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -128,13 +128,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt index 81047a3..1e573be 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/EquipmentActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -129,7 +129,7 @@ when (it.what) { 2023020801 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无设备") { @@ -138,13 +138,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt index b0dcb5d..3caf6b0 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -24,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -33,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -116,7 +117,7 @@ when (it.what) { 2023021001 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -125,10 +126,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt index 441379d..9d5e287 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/MeterageTrainDetailActivity.kt @@ -1,14 +1,18 @@ package com.casic.xz.meterage.view.home import androidx.fragment.app.Fragment +import androidx.lifecycle.ViewModelProvider import com.casic.xz.meterage.R import com.casic.xz.meterage.adapter.SubViewPagerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.fragment.train.BasicInformationFragment import com.casic.xz.meterage.fragment.train.StudentsFragment +import com.casic.xz.meterage.utils.LocaleConstant +import com.casic.xz.meterage.vm.UserViewModel import com.gyf.immersionbar.ImmersionBar import com.pengxh.kt.lite.base.KotlinBaseActivity import com.pengxh.kt.lite.utils.Constant +import com.pengxh.kt.lite.utils.SaveKeyValues import kotlinx.android.synthetic.main.activity_meterage_train_detail.* import kotlinx.android.synthetic.main.include_base_title.* @@ -19,16 +23,26 @@ override fun initData() { val trainId = intent.getStringExtra(Constant.INTENT_PARAM)!! - fragmentPages.add(BasicInformationFragment(trainId)) - fragmentPages.add(StudentsFragment()) + val userViewModel = ViewModelProvider(this)[UserViewModel::class.java] + userViewModel.getUserInfo(SaveKeyValues.getValue(LocaleConstant.ACCOUNT, "") as String) + userViewModel.userInfo.observe(this) { + if (it.code == 200) { + val data = it.data - val devicePageTitles = arrayOf("基础信息", "培训学员") - trainViewPager.adapter = SubViewPagerAdapter( - supportFragmentManager, fragmentPages, devicePageTitles - ) - trainViewPager.offscreenPageLimit = fragmentPages.size - //绑定 - topTabLayout.setupWithViewPager(trainViewPager) + fragmentPages.add(BasicInformationFragment(trainId)) + if (data.roleTips.contains("administrator")) { + fragmentPages.add(StudentsFragment()) + } + + val devicePageTitles = arrayOf("基础信息", "培训学员") + trainViewPager.adapter = SubViewPagerAdapter( + supportFragmentManager, fragmentPages, devicePageTitles + ) + trainViewPager.offscreenPageLimit = fragmentPages.size + //绑定 + topTabLayout.setupWithViewPager(trainViewPager) + } + } } override fun initEvent() { diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt index 568556b..b22304f 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -25,7 +25,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -34,7 +34,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020901 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt index 02187db..877b46b 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/home/StandardDeviceDetailActivity.kt @@ -21,10 +21,10 @@ fragmentPages.add(BasicInformationFragment(deviceId)) fragmentPages.add(MeasurementStaffFragment(deviceId)) fragmentPages.add(SupportEquipmentFragment(deviceId)) - fragmentPages.add(UsageRecordFragment()) + fragmentPages.add(VerifyRegulationFragment(deviceId)) fragmentPages.add(CertificateFragment()) - val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "使用记录", "检定证书") + val devicePageTitles = arrayOf("基础信息", "计量人员", "标准配套设备", "检定规程", "检定证书") deiceViewPager.adapter = SubViewPagerAdapter( supportFragmentManager, fragmentPages, devicePageTitles ) diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt index 21fe5ed..a9d9422 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeDetailActivity.kt @@ -29,7 +29,7 @@ noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] noticeViewModel.getNoticeList(args[0], args[1], args[2], "", "", 1) - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRow = it.data?.rows!![0] diff --git a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt index a515002..4c67d7a 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/notice/NoticeListActivity.kt @@ -6,7 +6,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.NoticeListAdapter +import com.casic.xz.meterage.adapter.NoticeAdapter import com.casic.xz.meterage.extensions.addAll import com.casic.xz.meterage.extensions.combineFilePath import com.casic.xz.meterage.extensions.initLayoutImmersionBar @@ -26,7 +26,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var noticeViewModel: NoticeViewModel - private lateinit var noticeListAdapter: NoticeListAdapter + private lateinit var noticeAdapter: NoticeAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -35,7 +35,7 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) noticeViewModel = ViewModelProvider(this)[NoticeViewModel::class.java] - noticeViewModel.noticeResult.observe(this) { + noticeViewModel.noticeList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! // countBadeNumber(dataRows) @@ -126,7 +126,7 @@ when (it.what) { 2023013101 -> { if (isRefresh || isLoadMore) { - noticeListAdapter.notifyDataSetChanged() + noticeAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有任何消息") { @@ -135,13 +135,13 @@ } } else { emptyView!!.hide() - noticeListAdapter = NoticeListAdapter(this, dataBeans) + noticeAdapter = NoticeAdapter(this, dataBeans) noticeRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - noticeRecyclerView.adapter = noticeListAdapter - noticeListAdapter.setOnItemClickListener(object : - NoticeListAdapter.OnItemClickListener { + noticeRecyclerView.adapter = noticeAdapter + noticeAdapter.setOnItemClickListener(object : + NoticeAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] val allArgs = addAll( 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 b0bfd9c..8961e4a 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 @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CapabilityListAdapter +import com.casic.xz.meterage.adapter.CapabilityAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CapabilityListModel @@ -28,7 +28,7 @@ private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var capabilityViewModel: CapabilityViewModel - private lateinit var capabilityListAdapter: CapabilityListAdapter + private lateinit var capabilityAdapter: CapabilityAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +39,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) capabilityViewModel = ViewModelProvider(this)[CapabilityViewModel::class.java] - capabilityViewModel.capabilityResult.observe(this) { + capabilityViewModel.capabilityList.observe(this) { if (it.code == 200) { val dataRows = it.data?.records!! when { @@ -115,7 +115,7 @@ when (it.what) { 2023020903 -> { if (isRefresh || isLoadMore) { - capabilityListAdapter.notifyDataSetChanged() + capabilityAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无数据") { @@ -124,13 +124,13 @@ } } else { emptyView!!.hide() - capabilityListAdapter = CapabilityListAdapter(this, dataBeans) + capabilityAdapter = CapabilityAdapter(this, dataBeans) capabilityRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - capabilityRecyclerView.adapter = capabilityListAdapter - capabilityListAdapter.setOnItemClickListener(object : - CapabilityListAdapter.OnItemClickListener { + capabilityRecyclerView.adapter = capabilityAdapter + capabilityAdapter.setOnItemClickListener(object : + CapabilityAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt index 64f00ea..a314da9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchCustomerResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.CustomerListAdapter +import com.casic.xz.meterage.adapter.CustomerAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.CustomerListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var customerViewModel: CustomerViewModel - private lateinit var customerListAdapter: CustomerListAdapter + private lateinit var customerAdapter: CustomerAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) customerViewModel = ViewModelProvider(this)[CustomerViewModel::class.java] - customerViewModel.customerResult.observe(this) { + customerViewModel.customerList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -120,7 +120,7 @@ when (it.what) { 2023021302 -> { if (isRefresh || isLoadMore) { - customerListAdapter.notifyDataSetChanged() + customerAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无客户数据") { @@ -129,13 +129,13 @@ } } else { emptyView!!.hide() - customerListAdapter = CustomerListAdapter(this, dataBeans) + customerAdapter = CustomerAdapter(this, dataBeans) customerRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - customerRecyclerView.adapter = customerListAdapter - customerListAdapter.setOnItemClickListener(object : - CustomerListAdapter.OnItemClickListener { + customerRecyclerView.adapter = customerAdapter + customerAdapter.setOnItemClickListener(object : + CustomerAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt index fc2b4d0..0f9f0b9 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchEquipmentResultActivity.kt @@ -1,11 +1,10 @@ package com.casic.xz.meterage.view.search import android.os.Handler -import android.view.View import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.EquipmentListAdapter +import com.casic.xz.meterage.adapter.EquipmentAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.EquipmentListModel @@ -28,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var equipmentListAdapter: EquipmentListAdapter + private lateinit var equipmentAdapter: EquipmentAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -39,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.equipmentResult.observe(this) { + equipmentViewModel.equipmentList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -132,7 +131,7 @@ when (it.what) { 2023020802 -> { if (isRefresh || isLoadMore) { - equipmentListAdapter.notifyDataSetChanged() + equipmentAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("没有查询到符合条件的设备数据") { @@ -141,13 +140,13 @@ } } else { emptyView!!.hide() - equipmentListAdapter = EquipmentListAdapter(this, dataBeans) + equipmentAdapter = EquipmentAdapter(this, dataBeans) equipmentRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - equipmentRecyclerView.adapter = equipmentListAdapter - equipmentListAdapter.setOnItemClickListener(object : - EquipmentListAdapter.OnItemClickListener { + equipmentRecyclerView.adapter = equipmentAdapter + equipmentAdapter.setOnItemClickListener(object : + EquipmentAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt index f275890..a6da484 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchMeterageTrainResultActivity.kt @@ -2,8 +2,9 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider +import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.MeterageTrainListAdapter +import com.casic.xz.meterage.adapter.MeterageTrainAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.MeterageTrainListModel @@ -26,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var meterageTrainViewModel: MeterageTrainViewModel - private lateinit var meterageTrainListAdapter: MeterageTrainListAdapter + private lateinit var meterageTrainAdapter: MeterageTrainAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -37,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) meterageTrainViewModel = ViewModelProvider(this)[MeterageTrainViewModel::class.java] - meterageTrainViewModel.meterageTrainResult.observe(this) { + meterageTrainViewModel.meterageTrainList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -124,7 +125,7 @@ when (it.what) { 2023021002 -> { if (isRefresh || isLoadMore) { - meterageTrainListAdapter.notifyDataSetChanged() + meterageTrainAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无培训计划") { @@ -133,10 +134,13 @@ } } else { emptyView!!.hide() - meterageTrainListAdapter = MeterageTrainListAdapter(this, dataBeans) - trainRecyclerView.adapter = meterageTrainListAdapter - meterageTrainListAdapter.setOnItemClickListener(object : - MeterageTrainListAdapter.OnItemClickListener { + meterageTrainAdapter = MeterageTrainAdapter(this, dataBeans) + trainRecyclerView.addItemDecoration( + DividerItemDecoration(this, DividerItemDecoration.VERTICAL) + ) + trainRecyclerView.adapter = meterageTrainAdapter + meterageTrainAdapter.setOnItemClickListener(object : + MeterageTrainAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt index 32712e2..fcda071 100644 --- a/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt +++ b/app/src/main/java/com/casic/xz/meterage/view/search/SearchStandardDeviceResultActivity.kt @@ -4,7 +4,7 @@ import androidx.lifecycle.ViewModelProvider import androidx.recyclerview.widget.DividerItemDecoration import com.casic.xz.meterage.R -import com.casic.xz.meterage.adapter.StandardDeviceListAdapter +import com.casic.xz.meterage.adapter.StandardDeviceAdapter import com.casic.xz.meterage.extensions.initLayoutImmersionBar import com.casic.xz.meterage.extensions.showEmptyPage import com.casic.xz.meterage.model.StandardDeviceListModel @@ -27,7 +27,7 @@ private lateinit var param: String private lateinit var weakReferenceHandler: WeakReferenceHandler private lateinit var equipmentViewModel: EquipmentViewModel - private lateinit var deviceListAdapter: StandardDeviceListAdapter + private lateinit var deviceAdapter: StandardDeviceAdapter private var dataBeans: MutableList = ArrayList() private var pageIndex = 1 private var isRefresh = false @@ -38,7 +38,7 @@ weakReferenceHandler = WeakReferenceHandler(callback) equipmentViewModel = ViewModelProvider(this)[EquipmentViewModel::class.java] - equipmentViewModel.standardDeviceResult.observe(this) { + equipmentViewModel.standardDeviceList.observe(this) { if (it.code == 200) { val dataRows = it.data?.rows!! when { @@ -122,7 +122,7 @@ when (it.what) { 2023020902 -> { if (isRefresh || isLoadMore) { - deviceListAdapter.notifyDataSetChanged() + deviceAdapter.notifyDataSetChanged() } else { if (dataBeans.size == 0) { emptyView!!.showEmptyPage("无标准装置") { @@ -131,13 +131,13 @@ } } else { emptyView!!.hide() - deviceListAdapter = StandardDeviceListAdapter(this, dataBeans) + deviceAdapter = StandardDeviceAdapter(this, dataBeans) standardDeviceRecyclerView.addItemDecoration( DividerItemDecoration(this, DividerItemDecoration.VERTICAL) ) - standardDeviceRecyclerView.adapter = deviceListAdapter - deviceListAdapter.setOnItemClickListener(object : - StandardDeviceListAdapter.OnItemClickListener { + standardDeviceRecyclerView.adapter = deviceAdapter + deviceAdapter.setOnItemClickListener(object : + StandardDeviceAdapter.OnItemClickListener { override fun onItemClicked(position: Int) { val rowsModel = dataBeans[position] navigatePageTo(rowsModel.id) diff --git a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt index 8e9b2ee..f3185b8 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/AuthenticateViewModel.kt @@ -12,6 +12,9 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * PublicKey VM + * */ class AuthenticateViewModel : BaseViewModel() { private val gson by lazy { Gson() } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt index 595f9cb..b40cf4f 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CapabilityViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 能力相关 VM + * */ class CapabilityViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val capabilityResult = MutableLiveData() - val capabilityDetailResult = MutableLiveData() + val capabilityList = MutableLiveData() + val capabilityDetail = MutableLiveData() fun getCapabilityList( checkType: String, @@ -35,7 +38,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityResult.value = gson.fromJson( + capabilityList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -53,7 +56,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - capabilityDetailResult.value = gson.fromJson( + capabilityDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt index c043328..0b35cc1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/CustomerViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 客户相关 VM + * */ class CustomerViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val customerResult = MutableLiveData() - val customerDetailResult = MutableLiveData() + val customerList = MutableLiveData() + val customerDetail = MutableLiveData() fun getCustomerList( bussinessSize: String, customerName: String, customerNo: String, grade: String, offset: Int @@ -30,7 +33,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerResult.value = gson.fromJson( + customerList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - customerDetailResult.value = gson.fromJson( + customerDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt index 6700e37..cf2b7a0 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/EquipmentViewModel.kt @@ -13,14 +13,17 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 装备、装置相关 VM + * */ class EquipmentViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val equipmentResult = MutableLiveData() - val equipmentDetailResult = MutableLiveData() - val standardDeviceResult = MutableLiveData() - val standardDeviceDetailResult = MutableLiveData() - val supportEquipmentResult = MutableLiveData() + val equipmentList = MutableLiveData() + val equipmentDetail = MutableLiveData() + val standardDeviceList = MutableLiveData() + val standardDeviceDetail = MutableLiveData() + val supportEquipmentList = MutableLiveData() fun getEquipmentList( equipmentNo: String, @@ -62,7 +65,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentResult.value = gson.fromJson( + equipmentList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -80,7 +83,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - equipmentDetailResult.value = gson.fromJson( + equipmentDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -116,7 +119,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceResult.value = gson.fromJson( + standardDeviceList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -134,7 +137,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - standardDeviceDetailResult.value = gson.fromJson( + standardDeviceDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -146,14 +149,14 @@ it.cause.toString().show(BaseApplication.get()) }) - fun getSupportEquipment(id: String) = launch({ + fun getSupportEquipmentList(id: String) = launch({ loadState.value = LoadState.Loading - val response = RetrofitServiceManager.getSupportEquipment(id) + val response = RetrofitServiceManager.getSupportEquipmentList(id) val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - supportEquipmentResult.value = gson.fromJson( - response, object : TypeToken() {}.type + supportEquipmentList.value = gson.fromJson( + response, object : TypeToken() {}.type ) } else { loadState.value = LoadState.Fail diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt index 4aac8e8..4b56da4 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageStaffViewModel.kt @@ -13,10 +13,13 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 计量人员 VM + * */ class MeterageStaffViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val staffResult = MutableLiveData() + val staffList = MutableLiveData() fun getStaffList(id: String) = launch({ loadState.value = LoadState.Loading @@ -24,7 +27,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - staffResult.value = gson.fromJson( + staffList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt index 65212d1..a76a083 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/MeterageTrainViewModel.kt @@ -14,11 +14,14 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 培训相关 VM + * */ class MeterageTrainViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val meterageTrainResult = MutableLiveData() - val meterageTrainDetailResult = MutableLiveData() + val meterageTrainList = MutableLiveData() + val meterageTrainDetail = MutableLiveData() fun getMeterageTrainList( createStartTime: String, @@ -48,7 +51,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainResult.value = gson.fromJson( + meterageTrainList.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { @@ -66,7 +69,7 @@ val responseCode = response.separateResponseCode() if (responseCode == 200) { loadState.value = LoadState.Success - meterageTrainDetailResult.value = gson.fromJson( + meterageTrainDetail.value = gson.fromJson( response, object : TypeToken() {}.type ) } else { diff --git a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt index 9707c55..7f97fa1 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/NoticeViewModel.kt @@ -11,10 +11,13 @@ import com.pengxh.kt.lite.extensions.show import com.pengxh.kt.lite.vm.BaseViewModel +/** + * 消息通知 VM + * */ class NoticeViewModel : BaseViewModel() { private val gson by lazy { Gson() } - val noticeResult = MutableLiveData() + val noticeList = MutableLiveData() fun getNoticeList( noticeNo: String, @@ -34,7 +37,7 @@ ) val responseCode = response.separateResponseCode() if (responseCode == 200) { - noticeResult.value = gson.fromJson( + noticeList.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt index f81af1d..a18380e 100644 --- a/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt +++ b/app/src/main/java/com/casic/xz/meterage/vm/UserViewModel.kt @@ -14,13 +14,16 @@ import com.pengxh.kt.lite.vm.BaseViewModel import com.pengxh.kt.lite.vm.LoadState +/** + * 用户相关 VM + * */ class UserViewModel : BaseViewModel() { private val gson by lazy { Gson() } // val registerResult = MutableLiveData() val loginResult = MutableLiveData() - val userInfoResult = MutableLiveData() + val userInfo = MutableLiveData() // val outResultModel = MutableLiveData() // fun register( @@ -72,7 +75,7 @@ val response = RetrofitServiceManager.getUserInfo(account) val responseCode = response.separateResponseCode() if (responseCode == 200) { - userInfoResult.value = gson.fromJson( + userInfo.value = gson.fromJson( response, object : TypeToken() {}.type ) } diff --git a/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt new file mode 100644 index 0000000..7e21d41 --- /dev/null +++ b/app/src/main/java/com/casic/xz/meterage/vm/VerifyViewModel.kt @@ -0,0 +1,41 @@ +package com.casic.xz.meterage.vm + +import androidx.lifecycle.MutableLiveData +import com.casic.xz.meterage.base.BaseApplication +import com.casic.xz.meterage.extensions.separateResponseCode +import com.casic.xz.meterage.extensions.toErrorMessage +import com.casic.xz.meterage.model.VerifyRegulationListModel +import com.casic.xz.meterage.utils.retrofit.RetrofitServiceManager +import com.google.gson.Gson +import com.google.gson.reflect.TypeToken +import com.pengxh.kt.lite.extensions.launch +import com.pengxh.kt.lite.extensions.show +import com.pengxh.kt.lite.vm.BaseViewModel +import com.pengxh.kt.lite.vm.LoadState + +/** + * 检定相关 VM + * */ +class VerifyViewModel : BaseViewModel() { + + private val gson by lazy { Gson() } + val verifyProcedureList = MutableLiveData() + + fun getVerifyProcedureList(id: String) = launch({ + loadState.value = LoadState.Loading + val response = RetrofitServiceManager.getVerifyProcedureList(id) + val responseCode = response.separateResponseCode() + if (responseCode == 200) { + loadState.value = LoadState.Success + verifyProcedureList.value = gson.fromJson( + response, object : TypeToken() {}.type + ) + } else { + loadState.value = LoadState.Fail + response.toErrorMessage().show(BaseApplication.get()) + } + }, { + loadState.value = LoadState.Fail + it.cause.toString().show(BaseApplication.get()) + }) +} \ 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 1d8e1f7..32da390 100644 --- a/app/src/main/res/layout/activity_capability.xml +++ b/app/src/main/res/layout/activity_capability.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_customer.xml b/app/src/main/res/layout/activity_customer.xml index 22ec15f..8993d97 100644 --- a/app/src/main/res/layout/activity_customer.xml +++ b/app/src/main/res/layout/activity_customer.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_equipment.xml b/app/src/main/res/layout/activity_equipment.xml index d6a64b1..193d459 100644 --- a/app/src/main/res/layout/activity_equipment.xml +++ b/app/src/main/res/layout/activity_equipment.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_meterage_train.xml b/app/src/main/res/layout/activity_meterage_train.xml index 4420a96..7783d74 100644 --- a/app/src/main/res/layout/activity_meterage_train.xml +++ b/app/src/main/res/layout/activity_meterage_train.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_notice_list.xml b/app/src/main/res/layout/activity_notice_list.xml index a6b3fe6..439847b 100644 --- a/app/src/main/res/layout/activity_notice_list.xml +++ b/app/src/main/res/layout/activity_notice_list.xml @@ -4,7 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@color/mainBackground" + android:background="@color/white" android:orientation="vertical"> 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 068a33c..c3fc8c3 100644 --- a/app/src/main/res/layout/activity_search_capability_reasult.xml +++ b/app/src/main/res/layout/activity_search_capability_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer.xml b/app/src/main/res/layout/activity_search_customer.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_customer.xml +++ b/app/src/main/res/layout/activity_search_customer.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_customer_reasult.xml b/app/src/main/res/layout/activity_search_customer_reasult.xml index 69a77f1..06a251c 100644 --- a/app/src/main/res/layout/activity_search_customer_reasult.xml +++ b/app/src/main/res/layout/activity_search_customer_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment.xml b/app/src/main/res/layout/activity_search_equipment.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_equipment.xml +++ b/app/src/main/res/layout/activity_search_equipment.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_equipment_reasult.xml b/app/src/main/res/layout/activity_search_equipment_reasult.xml index 9136ce5..03c2808 100644 --- a/app/src/main/res/layout/activity_search_equipment_reasult.xml +++ b/app/src/main/res/layout/activity_search_equipment_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train.xml b/app/src/main/res/layout/activity_search_meterage_train.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_meterage_train.xml +++ b/app/src/main/res/layout/activity_search_meterage_train.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml index 8af0abd..46322ee 100644 --- a/app/src/main/res/layout/activity_search_meterage_train_reasult.xml +++ b/app/src/main/res/layout/activity_search_meterage_train_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device.xml b/app/src/main/res/layout/activity_search_standard_device.xml index e8350cc..45694fb 100644 --- a/app/src/main/res/layout/activity_search_standard_device.xml +++ b/app/src/main/res/layout/activity_search_standard_device.xml @@ -3,6 +3,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_search_standard_device_reasult.xml b/app/src/main/res/layout/activity_search_standard_device_reasult.xml index 74ee063..de6f785 100644 --- a/app/src/main/res/layout/activity_search_standard_device_reasult.xml +++ b/app/src/main/res/layout/activity_search_standard_device_reasult.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/activity_standard_device.xml b/app/src/main/res/layout/activity_standard_device.xml index 62a9524..815261d 100644 --- a/app/src/main/res/layout/activity_standard_device.xml +++ b/app/src/main/res/layout/activity_standard_device.xml @@ -4,6 +4,7 @@ android:id="@+id/rootView" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/white" android:orientation="vertical"> diff --git a/app/src/main/res/layout/fragment_customer_certificate.xml b/app/src/main/res/layout/fragment_customer_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_certificate.xml +++ b/app/src/main/res/layout/fragment_customer_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_contract_record.xml b/app/src/main/res/layout/fragment_customer_contract_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_contract_record.xml +++ b/app/src/main/res/layout/fragment_customer_contract_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_personnel.xml b/app/src/main/res/layout/fragment_customer_personnel.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_personnel.xml +++ b/app/src/main/res/layout/fragment_customer_personnel.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_customer_sample_record.xml b/app/src/main/res/layout/fragment_customer_sample_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_customer_sample_record.xml +++ b/app/src/main/res/layout/fragment_customer_sample_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_certificate.xml b/app/src/main/res/layout/fragment_device_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_device_certificate.xml +++ b/app/src/main/res/layout/fragment_device_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_measurement_staff.xml b/app/src/main/res/layout/fragment_device_measurement_staff.xml index fa45c10..b4855f5 100644 --- a/app/src/main/res/layout/fragment_device_measurement_staff.xml +++ b/app/src/main/res/layout/fragment_device_measurement_staff.xml @@ -2,7 +2,8 @@ + android:layout_height="match_parent" + android:background="@color/white"> + android:layout_height="match_parent" + android:background="@color/white"> diff --git a/app/src/main/res/layout/fragment_device_usage_record.xml b/app/src/main/res/layout/fragment_device_usage_record.xml deleted file mode 100644 index 77d9ef6..0000000 --- a/app/src/main/res/layout/fragment_device_usage_record.xml +++ /dev/null @@ -1,6 +0,0 @@ - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_device_verify_regulation.xml b/app/src/main/res/layout/fragment_device_verify_regulation.xml new file mode 100644 index 0000000..2976042 --- /dev/null +++ b/app/src/main/res/layout/fragment_device_verify_regulation.xml @@ -0,0 +1,13 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_certificate.xml b/app/src/main/res/layout/fragment_equipment_certificate.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_certificate.xml +++ b/app/src/main/res/layout/fragment_equipment_certificate.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_change_record.xml b/app/src/main/res/layout/fragment_equipment_change_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_change_record.xml +++ b/app/src/main/res/layout/fragment_equipment_change_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_inspection_record.xml b/app/src/main/res/layout/fragment_equipment_inspection_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_inspection_record.xml +++ b/app/src/main/res/layout/fragment_equipment_inspection_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_equipment_usage_record.xml b/app/src/main/res/layout/fragment_equipment_usage_record.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_equipment_usage_record.xml +++ b/app/src/main/res/layout/fragment_equipment_usage_record.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_train_students.xml b/app/src/main/res/layout/fragment_train_students.xml index 77d9ef6..3728533 100644 --- a/app/src/main/res/layout/fragment_train_students.xml +++ b/app/src/main/res/layout/fragment_train_students.xml @@ -1,6 +1,7 @@ + android:layout_height="match_parent" + android:background="@color/white"> \ No newline at end of file diff --git a/app/src/main/res/layout/item_device_regulation_rv_l.xml b/app/src/main/res/layout/item_device_regulation_rv_l.xml new file mode 100644 index 0000000..0476679 --- /dev/null +++ b/app/src/main/res/layout/item_device_regulation_rv_l.xml @@ -0,0 +1,12 @@ + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_meterage_train_rv_l.xml b/app/src/main/res/layout/item_meterage_train_rv_l.xml index 24abc1b..abde980 100644 --- a/app/src/main/res/layout/item_meterage_train_rv_l.xml +++ b/app/src/main/res/layout/item_meterage_train_rv_l.xml @@ -2,16 +2,14 @@ + android:layout_height="wrap_content"> + android:orientation="horizontal" + android:padding="@dimen/dp_5"> @@ -71,7 +69,7 @@