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 785230a..277d8de 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { 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 785230a..277d8de 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { 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 3fde8c0..3745d29 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { 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 785230a..277d8de 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { 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 3fde8c0..3745d29 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 90dc1db..5ada8ad 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -33,6 +33,7 @@ private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false + private var clickedPosition = 0 override fun initLayoutView(): Int = R.layout.fragment_order_not_processed @@ -44,8 +45,12 @@ weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { @@ -96,9 +101,8 @@ is LoadState.Success -> { DialogHelper.dismissLoadingDialog() //接单成功之后刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.NOT_PROCESSED_ACTION, Constant.NOT_CONFIRMED_ACTION -// ) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + dataBeans.removeAt(clickedPosition) } else -> { DialogHelper.dismissLoadingDialog() @@ -138,6 +142,8 @@ } override fun onOperationClicked(position: Int) { + //标记被点击的item位置 + clickedPosition = position AlertControlDialog.Builder() .setContext(requireContext()) .setTitle("操作提示") 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 785230a..277d8de 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { 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 3fde8c0..3745d29 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 @@ -39,8 +39,12 @@ override fun initData() { weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt index 90dc1db..5ada8ad 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotProcessedFragment.kt @@ -33,6 +33,7 @@ private var pageIndex = 1 private var isRefresh = false private var isLoadMore = false + private var clickedPosition = 0 override fun initLayoutView(): Int = R.layout.fragment_order_not_processed @@ -44,8 +45,12 @@ weakReferenceHandler = WeakReferenceHandler(callback) workOrderViewModel = ViewModelProvider(this).get(WorkOrderViewModel::class.java) operationViewModel = ViewModelProvider(this).get(OperationViewModel::class.java) + } + + override fun onResume() { //默认加载第一页 obtainWorkOrderList() + super.onResume() } override fun initEvent() { @@ -96,9 +101,8 @@ is LoadState.Success -> { DialogHelper.dismissLoadingDialog() //接单成功之后刷新数据 -// BroadcastReceiverManager.instance.sendMultiBroadcast( -// Constant.NOT_PROCESSED_ACTION, Constant.NOT_CONFIRMED_ACTION -// ) + notProcessedAdapter.notifyItemRemoved(clickedPosition) + dataBeans.removeAt(clickedPosition) } else -> { DialogHelper.dismissLoadingDialog() @@ -138,6 +142,8 @@ } override fun onOperationClicked(position: Int) { + //标记被点击的item位置 + clickedPosition = position AlertControlDialog.Builder() .setContext(requireContext()) .setTitle("操作提示") 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 83f67e8..db5a495 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 @@ -251,20 +251,6 @@ } is LoadState.Success -> { DialogHelper.dismissLoadingDialog() - /** - * 确认工单首先需要刷新待确认列表 - * 1、如果是提交工单,选择正常,需要刷新已完成列表 - * 2、如果是提交工单,选择异常,需要刷新处理中列表 - * */ -// if (needHandle == "0") { -// BroadcastReceiverManager.instance.sendBroadcast( -// Constant.COMPLETED_ACTION, "" -// ) -// } else { -// BroadcastReceiverManager.instance.sendBroadcast( -// Constant.IN_HANDLE_ACTION, "" -// ) -// } this.finish() } else -> {