diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml deleted file mode 100644 index 1e1252a..0000000 --- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml deleted file mode 100644 index 1e1252a..0000000 --- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml new file mode 100644 index 0000000..1e1252a --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt index 2ea7c92..c5fe17f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/DeviceListAdapter.kt @@ -8,6 +8,7 @@ import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.DeviceListModel +import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class DeviceListAdapter( context: Context, private val dataRows: MutableList @@ -38,9 +39,16 @@ holder.wellCodeView.text = String.format("井编号：${rowsBean.wellCode}") holder.devLocationView.text = String.format("位置：${rowsBean.position}") holder.devInstallTimeView.text = String.format("安装日期：${rowsBean.installDate}") - //绑定事件 - holder.itemView.setOnClickListener { - listener?.onClicked(position) + if (rowsBean.deviceTypeName == "远程水表") { + holder.operationButton.visibility = View.VISIBLE + holder.operationButton.setOnClickListener { + listener?.onButtonClicked(position) + } + } else { + holder.operationButton.visibility = View.GONE + holder.itemView.setOnClickListener { + listener?.onClicked(position) + } } } @@ -50,12 +58,15 @@ var wellCodeView: TextView = view.findViewById(R.id.wellCodeView) var devLocationView: TextView = view.findViewById(R.id.devLocationView) var devInstallTimeView: TextView = view.findViewById(R.id.devInstallTimeView) + var operationButton: QMUIRoundButton = view.findViewById(R.id.operationButton) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) + + fun onButtonClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt index 0648621..67aa1c4 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderCompletedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderCompletedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_completed_recycleview, parent, false + R.layout.item_order_completed_rv, parent, false ) ) } @@ -61,7 +60,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt index 71cf3b1..db7c2aa 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderInHandleAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderInHandleAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_in_handle_recycleview, parent, false + R.layout.item_order_in_handle_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt index 69998f8..a4acc29 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotConfirmedAdapter.kt @@ -6,7 +6,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -27,7 +26,7 @@ ): OrderNotConfirmedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_confirmed_recycleview, parent, false + R.layout.item_order_not_confirmed_rv, parent, false ) ) } @@ -60,7 +59,6 @@ val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt index f65b307..5bc8fd0 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/OrderNotProcessedAdapter.kt @@ -21,7 +21,7 @@ ): OrderNotProcessedAdapter.ItemViewHolder { return ItemViewHolder( layoutInflater.inflate( - R.layout.item_order_not_processed_recycleview, parent, false + R.layout.item_order_not_processed_rv, parent, false ) ) } diff --git a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt index 97f8c03..eb1bf4f 100644 --- a/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt +++ b/app/src/main/java/com/casic/qd/smartwell/adapter/SearchResultAdapter.kt @@ -7,7 +7,6 @@ import android.widget.ImageView import android.widget.RelativeLayout import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.extensions.arrowAnimation @@ -68,7 +67,6 @@ //timeLineLayout下属UI val expandableViewAdapter = ExpandableViewAdapter(context) holder.expandableView.adapter = expandableViewAdapter - holder.expandableView.layoutManager = LinearLayoutManager(context) holder.expandableView.addItemDecoration(TimeLineItemDecoration(context)) holder.expandableImageView.setOnClickListener { if (!isExpand) { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt index f674ff5..d41c71e 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderCompletedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderCompletedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() completedAdapter = OrderCompletedAdapter(requireContext(), dataBeans) - orderCompletedView!!.layoutManager = LinearLayoutManager(requireContext()) orderCompletedView!!.adapter = completedAdapter completedAdapter.setOnItemClickListener(object : OrderCompletedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt index fc9ef90..f59c975 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderInHandleFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderInHandleAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() inHandleAdapter = OrderInHandleAdapter(requireContext(), dataBeans) - orderInHandleView!!.layoutManager = LinearLayoutManager(requireContext()) orderInHandleView!!.adapter = inHandleAdapter inHandleAdapter.setOnItemClickListener(object : OrderInHandleAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 07b29c9..1f8009d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotConfirmedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -103,7 +102,6 @@ } else { emptyView!!.hide() notConfirmedAdapter = OrderNotConfirmedAdapter(requireContext(), dataBeans) - notConfirmedView!!.layoutManager = LinearLayoutManager(requireContext()) notConfirmedView!!.adapter = notConfirmedAdapter notConfirmedAdapter.setOnItemClickListener(object : OrderNotConfirmedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 5da985d..99bc1a9 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -2,7 +2,6 @@ import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.OrderNotProcessedAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -128,7 +127,6 @@ } else { emptyView!!.hide() notProcessedAdapter = OrderNotProcessedAdapter(requireContext(), dataBeans) - notProcessedView!!.layoutManager = LinearLayoutManager(requireContext()) notProcessedView!!.adapter = notProcessedAdapter notProcessedAdapter.setOnItemClickListener(object : OrderNotProcessedAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt index 85370c5..5239f65 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmManagementActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -132,7 +131,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - alarmListView!!.layoutManager = LinearLayoutManager(this) alarmListView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt index f9e8fbc..e72898d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/AlarmSearchResultActivity.kt @@ -3,7 +3,6 @@ import android.content.Context import android.os.Handler import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.AlarmListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -154,7 +153,6 @@ } else { emptyView!!.hide() alarmListAdapter = AlarmListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = alarmListAdapter alarmListAdapter.setOnItemClickListener(object : AlarmListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt index c02bcae..7d3463d 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderSearchResultActivity.kt @@ -4,7 +4,6 @@ import android.os.Handler import android.view.View import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.SearchResultAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -161,7 +160,6 @@ } else { emptyView!!.hide() searchResultAdapter = SearchResultAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = searchResultAdapter searchResultAdapter.setOnItemClickListener(object : SearchResultAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt index e13f27e..9aa1057 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDataActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceDataListAdapter import com.casic.qd.smartwell.extensions.showEmptyPage @@ -226,7 +225,6 @@ } else { emptyView!!.hide() dataListAdapter = DeviceDataListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = dataListAdapter dataListAdapter.setOnItemClickListener(object : DeviceDataListAdapter.OnItemClickListener { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt index 9633452..f1937ae 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/SearchDeviceActivity.kt @@ -9,7 +9,6 @@ import androidx.core.view.GravityCompat import androidx.drawerlayout.widget.DrawerLayout import androidx.lifecycle.ViewModelProvider -import androidx.recyclerview.widget.LinearLayoutManager import com.casic.qd.smartwell.R import com.casic.qd.smartwell.adapter.DeviceListAdapter import com.casic.qd.smartwell.extensions.addAll @@ -18,7 +17,8 @@ import com.casic.qd.smartwell.model.DeviceListModel import com.casic.qd.smartwell.model.DeviceTypeModel import com.casic.qd.smartwell.model.OwnerShipModel -import com.casic.qd.smartwell.utils.* +import com.casic.qd.smartwell.utils.DialogHelper +import com.casic.qd.smartwell.utils.LocaleConstant import com.casic.qd.smartwell.vm.AreaViewModel import com.casic.qd.smartwell.vm.AuthenticateViewModel import com.casic.qd.smartwell.vm.DeviceViewModel @@ -36,7 +36,6 @@ import com.pengxh.kt.lite.widget.dialog.AlertControlDialog import com.qmuiteam.qmui.widget.dialog.QMUIBottomSheet import kotlinx.android.synthetic.main.activity_device_search.* -import kotlinx.android.synthetic.main.activity_order_search.* import kotlinx.android.synthetic.main.include_empty_view.* /** @@ -382,25 +381,29 @@ } else { emptyView!!.hide() deviceListAdapter = DeviceListAdapter(this, dataBeans) - resultRecyclerView!!.layoutManager = LinearLayoutManager(this) resultRecyclerView!!.adapter = deviceListAdapter deviceListAdapter.setOnItemClickListener(object : DeviceListAdapter.OnItemClickListener { override fun onClicked(position: Int) { deviceCode = dataBeans[position].devcode.toString() if (deviceCode.isBlank()) { - "设备编号异常，无法查看历史数据".show(this@SearchDeviceActivity) + "设备编号异常，无法查看历史数据".show(context) return } - if (dataBeans[position].deviceTypeName == "远程水表") { - navigatePageTo(deviceCode) - } else { - //默认加载近一周的数据 - val time = System.currentTimeMillis() - val startTime = time.timestampToLastWeekTime() - val endTime = time.timestampToTime() - deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + //默认加载近一周的数据 + val time = System.currentTimeMillis() + val startTime = time.timestampToLastWeekTime() + val endTime = time.timestampToTime() + deviceViewModel.obtainSevenDayData(deviceCode, startTime, endTime) + } + + override fun onButtonClicked(position: Int) { + deviceCode = dataBeans[position].devcode.toString() + if (deviceCode.isBlank()) { + "设备编号异常，无法查看历史数据".show(context) + return } + navigatePageTo(deviceCode) } }) } diff --git a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt index 625ad8e..579ce64 100644 --- a/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt +++ b/app/src/main/java/com/casic/qd/smartwell/widgets/TimeLineBottomSheet.kt @@ -9,7 +9,6 @@ import android.view.ViewGroup import android.widget.ImageView import android.widget.TextView -import androidx.recyclerview.widget.LinearLayoutManager import androidx.recyclerview.widget.RecyclerView import com.casic.qd.smartwell.R import com.casic.qd.smartwell.model.OrderDetailModel @@ -48,7 +47,6 @@ setCanceledOnTouchOutside(true) //绑定流程进展数据 val orderFlowRecyclerView = findViewById(R.id.orderFlowRecyclerView) - orderFlowRecyclerView.layoutManager = LinearLayoutManager(ctx) orderFlowRecyclerView.adapter = OrderFlowAdapter() val dismissView = findViewById(R.id.dismissView) diff --git a/app/src/main/res/layout/activity_alarm_management.xml b/app/src/main/res/layout/activity_alarm_management.xml index 49b72b4..ab7a279 100644 --- a/app/src/main/res/layout/activity_alarm_management.xml +++ b/app/src/main/res/layout/activity_alarm_management.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> diff --git a/app/src/main/res/layout/fragment_order_completed.xml b/app/src/main/res/layout/fragment_order_completed.xml index 6f94512..99d78cd 100644 --- a/app/src/main/res/layout/fragment_order_completed.xml +++ b/app/src/main/res/layout/fragment_order_completed.xml @@ -1,5 +1,6 @@ + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> + android:layout_height="wrap_content" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> - + android:orientation="horizontal"> + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_recycleview.xml b/app/src/main/res/layout/item_order_completed_recycleview.xml deleted file mode 100644 index e306f30..0000000 --- a/app/src/main/res/layout/item_order_completed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_completed_rv.xml b/app/src/main/res/layout/item_order_completed_rv.xml new file mode 100644 index 0000000..a9dffbc --- /dev/null +++ b/app/src/main/res/layout/item_order_completed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_recycleview.xml b/app/src/main/res/layout/item_order_in_handle_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_in_handle_rv.xml b/app/src/main/res/layout/item_order_in_handle_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_in_handle_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml b/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml deleted file mode 100644 index 339c22d..0000000 --- a/app/src/main/res/layout/item_order_not_confirmed_recycleview.xml +++ /dev/null @@ -1,106 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_confirmed_rv.xml b/app/src/main/res/layout/item_order_not_confirmed_rv.xml new file mode 100644 index 0000000..a12931b --- /dev/null +++ b/app/src/main/res/layout/item_order_not_confirmed_rv.xml @@ -0,0 +1,108 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_recycleview.xml b/app/src/main/res/layout/item_order_not_processed_recycleview.xml deleted file mode 100644 index 1e1252a..0000000 --- a/app/src/main/res/layout/item_order_not_processed_recycleview.xml +++ /dev/null @@ -1,75 +0,0 @@ - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/app/src/main/res/layout/item_order_not_processed_rv.xml b/app/src/main/res/layout/item_order_not_processed_rv.xml new file mode 100644 index 0000000..1e1252a --- /dev/null +++ b/app/src/main/res/layout/item_order_not_processed_rv.xml @@ -0,0 +1,75 @@ + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/item_search_result_recycleview.xml b/app/src/main/res/layout/item_search_result_recycleview.xml index 60a5741..f6f45f0 100644 --- a/app/src/main/res/layout/item_search_result_recycleview.xml +++ b/app/src/main/res/layout/item_search_result_recycleview.xml @@ -123,5 +123,6 @@ android:layout_width="match_parent" android:layout_height="wrap_content" android:nestedScrollingEnabled="false" - android:scrollbars="none" /> + android:scrollbars="none" + app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" /> \ No newline at end of file