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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 c6877e4..74660f7 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 @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* @@ -121,22 +120,6 @@ } } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build() - .show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainSearchResult() { @@ -210,15 +193,6 @@ } }).build().show() } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 c6877e4..74660f7 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 @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* @@ -121,22 +120,6 @@ } } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build() - .show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainSearchResult() { @@ -210,15 +193,6 @@ } }).build().show() } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 856c296..45d24f5 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -173,27 +173,9 @@ - - - - - - + (jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 c6877e4..74660f7 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 @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* @@ -121,22 +120,6 @@ } } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build() - .show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainSearchResult() { @@ -210,15 +193,6 @@ } }).build().show() } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 856c296..45d24f5 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -173,27 +173,9 @@ - - - - - - + - - - - - - + (jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 c6877e4..74660f7 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 @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* @@ -121,22 +120,6 @@ } } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build() - .show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainSearchResult() { @@ -210,15 +193,6 @@ } }).build().show() } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 856c296..45d24f5 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -173,27 +173,9 @@ - - - - - - + - - - - - - + - - - - - - - - - \ No newline at end of file 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 c6877e4..74660f7 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 @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* @@ -121,22 +120,6 @@ } } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build() - .show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainSearchResult() { @@ -210,15 +193,6 @@ } }).build().show() } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 856c296..45d24f5 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -173,27 +173,9 @@ - - - - - - + - - - - - - + - - - - - - - - - \ 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 index 5605259..339c22d 100644 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml @@ -1,6 +1,5 @@ - - - - - - - - - \ No newline at end of file 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 3c1b7d4..0648621 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderCompletedAdapter( private val context: Context, @@ -79,11 +78,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -120,15 +114,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 70665b9..71cf3b1 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.model.ExpandableDataModel import com.casic.qd.smartwell.model.OrderListModel import com.casic.qd.smartwell.utils.TimeLineItemDecoration -import com.qmuiteam.qmui.widget.roundwidget.QMUIRoundButton class OrderInHandleAdapter( private val context: Context, @@ -78,11 +77,6 @@ expandableViewAdapter.clearAll() } } - - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } } } @@ -113,15 +107,12 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null interface OnItemClickListener { fun onClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 6cbc51d..97f8c03 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 @@ -5,7 +5,6 @@ import android.view.View import android.view.ViewGroup import android.widget.ImageView -import android.widget.LinearLayout import android.widget.RelativeLayout import android.widget.TextView import androidx.recyclerview.widget.LinearLayoutManager @@ -55,10 +54,8 @@ holder.currentStateView.text = String.format("${rowsBean.jobStatusName}-${rowsBean.jobBelongTo}") if (rowsBean.jobStatus == "0") { - //待处理订单需要显示接单按钮，隐藏流转记录 holder.operationLayout.visibility = View.VISIBLE holder.timeLineLayout.visibility = View.GONE - holder.transferLayout.visibility = View.GONE if (listener != null) { holder.operationButton.setChangeAlphaWhenPress(true) holder.operationButton.setOnClickListener { @@ -88,18 +85,6 @@ expandableViewAdapter.clearAll() } } - //transferLayout下属UI - if (rowsBean.jobStatus == "2" || rowsBean.jobStatus == "3") { - holder.transferLayout.visibility = View.VISIBLE - if (listener != null) { - holder.transferView.setChangeAlphaWhenPress(true) - holder.transferView.setOnClickListener { - listener!!.onTransferViewClicked(position) - } - } - } else { - holder.transferLayout.visibility = View.GONE - } } //item普通点击事件 @@ -156,8 +141,6 @@ var currentStateView: TextView = view.findViewById(R.id.currentStateView) var expandableImageView: ImageView = view.findViewById(R.id.expandableImageView) var expandableView: RecyclerView = view.findViewById(R.id.expandableView) - var transferLayout: LinearLayout = view.findViewById(R.id.transferLayout) - var transferView: QMUIRoundButton = view.findViewById(R.id.transferView) } private var listener: OnItemClickListener? = null @@ -166,8 +149,6 @@ fun onClicked(position: Int) fun onOperationClicked(position: Int) - - fun onTransferViewClicked(position: Int) } fun setOnItemClickListener(onClickListener: OnItemClickListener?) { 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 277d8de..75a9c82 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderCompletedDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_completed.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061501) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } 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 3745d29..8b63c8d 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 @@ -13,7 +13,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.view.OrderInHandleDetailActivity import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import kotlinx.android.synthetic.main.fragment_order_in_handle.* import kotlinx.android.synthetic.main.include_empty_view.* @@ -85,19 +84,6 @@ weakReferenceHandler.sendEmptyMessage(2022061502) } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder().setContext(requireContext()) - .setFlowItems(orderFlow).build().show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainWorkOrderList() { @@ -129,15 +115,6 @@ } requireContext().navigatePageTo(jobId) } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt index 2c84ec7..9918b82 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderInHandleDetailActivity.kt @@ -18,7 +18,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -175,19 +174,6 @@ acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } - //提交工单处理 submitButton.setOnClickListener { val orderId = orderDetail.jobId.toString() @@ -280,28 +266,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中，请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单需要刷新处理中和超时未处理的列表 - * */ -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, Constant.NOT_HANDLE_ACTION -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //处理完成工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -310,12 +274,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - //通知列表刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.IN_HANDLE_ACTION, -// Constant.COMPLETED_ACTION, -// Constant.NOT_HANDLE_ACTION -// ) this.finish() } else -> { diff --git a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index db5a495..cb764f5 100644 --- a/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt +++ b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.UploadImageViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.luck.picture.lib.basic.PictureSelector import com.luck.picture.lib.config.SelectMimeType import com.luck.picture.lib.entity.LocalMedia @@ -123,19 +122,6 @@ locationTipsView.visibility = View.GONE } - //工单流转细节 - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - transferTipsView.visibility = View.VISIBLE - transferTipsView.setOnClickListener { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build().show() - } - } else { - transferTipsView.visibility = View.GONE - } acceptDateView.text = orderDetail.getJobTime dispatchDateView.text = orderDetail.createTime 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 c6877e4..74660f7 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 @@ -17,7 +17,6 @@ import com.casic.qd.smartwell.utils.WeakReferenceHandler import com.casic.qd.smartwell.vm.OperationViewModel import com.casic.qd.smartwell.vm.WorkOrderViewModel -import com.casic.qd.smartwell.widgets.TimeLineBottomSheet import com.pengxh.app.multilib.widget.dialog.AlertControlDialog import kotlinx.android.synthetic.main.activity_order_search_result.* import kotlinx.android.synthetic.main.include_base_title.* @@ -121,22 +120,6 @@ } } }) - - workOrderViewModel.detailModel.observe(this, { - if (it.code == 200) { - val orderDetail = it.data!![0] - val orderFlow = orderDetail.flow!! - if (orderFlow.size != 0) { - TimeLineBottomSheet.Builder() - .setContext(this) - .setFlowItems(orderFlow) - .build() - .show() - } else { - "抱歉，无法查到该工单的流转记录".show() - } - } - }) } private fun obtainSearchResult() { @@ -210,15 +193,6 @@ } }).build().show() } - - override fun onTransferViewClicked(position: Int) { - val jobId = dataBeans[position].jobId.toString() - if (jobId.isBlank()) { - "工单编号异常，无法查看工单流转记录".show() - return - } - workOrderViewModel.obtainWorkOrderDetail(jobId) - } }) } } diff --git a/app/src/main/res/layout/activity_order_in_handle_detail.xml b/app/src/main/res/layout/activity_order_in_handle_detail.xml index 856c296..45d24f5 100644 --- a/app/src/main/res/layout/activity_order_in_handle_detail.xml +++ b/app/src/main/res/layout/activity_order_in_handle_detail.xml @@ -173,27 +173,9 @@ - - - - - - + - - - - - - + - - - - - - - - - \ 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 index 5605259..339c22d 100644 --- a/app/src/main/res/layout/item_order_in_handle_recycleview.xml +++ b/app/src/main/res/layout/item_order_in_handle_recycleview.xml @@ -1,6 +1,5 @@ - - - - - - - - - \ 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 01c649e..7477f33 100644 --- a/app/src/main/res/layout/item_search_result_recycleview.xml +++ b/app/src/main/res/layout/item_search_result_recycleview.xml @@ -125,37 +125,4 @@ android:layout_height="wrap_content" android:nestedScrollingEnabled="false" android:scrollbars="none" /> - - - - - - - - - \ No newline at end of file