diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 10ed242..7441111 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -38,8 +38,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/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 10ed242..7441111 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -38,8 +38,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/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index d527f47..83f67e8 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 @@ -243,28 +243,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中,请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单只需要刷新待确认列表 - * */ -// BroadcastReceiverManager.instance.sendBroadcast( -// Constant.NOT_CONFIRMED_ACTION, "" -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //确认工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -278,9 +256,6 @@ * 1、如果是提交工单,选择正常,需要刷新已完成列表 * 2、如果是提交工单,选择异常,需要刷新处理中列表 * */ -// BroadcastReceiverManager.instance.sendBroadcast( -// Constant.NOT_CONFIRMED_ACTION, "" -// ) // if (needHandle == "0") { // BroadcastReceiverManager.instance.sendBroadcast( // Constant.COMPLETED_ACTION, "" diff --git a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt index 10ed242..7441111 100644 --- a/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt +++ b/app/src/main/java/com/casic/qd/smartwell/fragment/OrderNotConfirmedFragment.kt @@ -38,8 +38,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/view/OrderNotConfirmedDetailActivity.kt b/app/src/main/java/com/casic/qd/smartwell/view/OrderNotConfirmedDetailActivity.kt index d527f47..83f67e8 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 @@ -243,28 +243,6 @@ dismissLoadingDialog() }) - //转单状态处理 - operationViewModel.loadState.observe(this, { - when (it) { - is LoadState.Loading -> { - DialogHelper.showLoadingDialog(this, "转单中,请稍后") - } - is LoadState.Success -> { - DialogHelper.dismissLoadingDialog() - /** - * 转单只需要刷新待确认列表 - * */ -// BroadcastReceiverManager.instance.sendBroadcast( -// Constant.NOT_CONFIRMED_ACTION, "" -// ) - this.finish() - } - else -> { - DialogHelper.dismissLoadingDialog() - } - } - }) - //确认工单状态处理 operationViewModel.loadState.observe(this, { when (it) { @@ -278,9 +256,6 @@ * 1、如果是提交工单,选择正常,需要刷新已完成列表 * 2、如果是提交工单,选择异常,需要刷新处理中列表 * */ -// BroadcastReceiverManager.instance.sendBroadcast( -// Constant.NOT_CONFIRMED_ACTION, "" -// ) // if (needHandle == "0") { // BroadcastReceiverManager.instance.sendBroadcast( // Constant.COMPLETED_ACTION, "" diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index c71ff3b..13293b0 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -73,7 +73,7 @@ wrap_content wrap_content true - end + center_vertical|end @dimen/dp_10 @dimen/dp_10 @color/mainTextColor