diff --git a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt index dbc648cb24..75f2366d28 100644 --- a/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt +++ b/OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/ui/view/LineSiteView.kt @@ -29,12 +29,14 @@ import com.mogo.och.bus.passenger.presenter.BusPassengerFunctionDevicePresenter import com.mogo.och.bus.passenger.ui.M1ContainFragment import com.mogo.och.bus.passenger.ui.adapter.OrderLineItemAdapter import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter +import com.mogo.och.bus.passenger.utils.RxUtils import com.mogo.och.bus.passenger.view.BottomDecoration import com.mogo.och.common.module.bean.dpmsg.ChangeDestMsg import com.mogo.och.common.module.bean.dpmsg.DPMsgType import com.mogo.och.common.module.biz.constant.OchCommonConst import com.mogo.och.common.module.biz.network.OchCommonServiceCallback import com.mogo.och.common.module.manager.OCHPlanningStopSideStatusManager +import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.m1.m1_order_lineside.view.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -84,6 +86,8 @@ class LineSiteView @JvmOverloads constructor( duration = 1000 } private var changeCheck: M1ContainFragment.ChangeCheck?=null + private var subscribeSelectLine: Disposable? = null + private var subscribeSelectSite: Disposable? = null init { LayoutInflater.from(context).inflate(R.layout.m1_order_lineside, this, true) @@ -284,6 +288,11 @@ class LineSiteView @JvmOverloads constructor( TAGLINELOOP, LoopInfo(3, ::checkServerStatus) ) + RxUtils.disposeSubscribe(subscribeSelectLine) + subscribeSelectLine= RxUtils.createSubscribe(120_1000){ + ToastUtils.showShort("请联系安全员确认") + endAni() + } } } tv_site_only_submit.onClick { @@ -313,6 +322,11 @@ class LineSiteView @JvmOverloads constructor( TAGLINELOOP, LoopInfo(3, ::checkServerStatus) ) + RxUtils.disposeSubscribe(subscribeSelectSite) + subscribeSelectSite = RxUtils.createSubscribe(120_1000){ + ToastUtils.showShort("请联系安全员确认") + endAni() + } } tv_loading_wait_driver_title.onClick { endAni() @@ -408,6 +422,7 @@ class LineSiteView @JvmOverloads constructor( tempCheckLineIsSubmit = false ToastUtils.showShort("司机端拒绝请重新选择") } + RxUtils.disposeSubscribe(subscribeSelectLine) } else { if (msg.isConfirmed) { ToastUtils.showShort("站点确定") @@ -430,6 +445,7 @@ class LineSiteView @JvmOverloads constructor( tempCheckLineIsSubmit = true ToastUtils.showShort("司机端拒绝请重新选择") } + RxUtils.disposeSubscribe(subscribeSelectSite) } BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) endAni() @@ -465,6 +481,8 @@ class LineSiteView @JvmOverloads constructor( override fun onDetachedFromWindow() { super.onDetachedFromWindow() loadingAni.cancel() + RxUtils.disposeSubscribe(subscribeSelectLine) + RxUtils.disposeSubscribe(subscribeSelectSite) CallerTelematicListenerManager.removeListener(TAG) BusPassengerModelLoopManager.removeLoopFunction(TAGLINELOOP) CharterPassengerModel.setControllerStatusCallback(TAG, null)