diff --git a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt index de5b0d4fdb..140eb2ef76 100644 --- a/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt +++ b/OCH/mogo-och-charter-passenger/src/main/java/com/mogo/och/bus/passenger/ui/dialogfragment/fragment/M1OrderLineFragment.kt @@ -21,6 +21,7 @@ import com.mogo.och.bus.passenger.ui.adapter.OrderSiteItemAdapter import com.mogo.och.bus.passenger.ui.dialogfragment.M1ContainFragment import com.mogo.och.bus.passenger.view.BottomDecoration import com.mogo.och.common.module.utils.RxUtils +import io.reactivex.disposables.Disposable import kotlinx.android.synthetic.main.m1_order_fragment.* import me.jessyan.autosize.utils.AutoSizeUtils @@ -40,6 +41,9 @@ class M1OrderLineFragment : val lineList = mutableListOf() val siteList = mutableListOf() + private var subscribeDirverAgree: Disposable? = null + private var subscribeDirverRefuse: Disposable? = null + override fun getLayoutId(): Int { return R.layout.m1_order_fragment @@ -133,10 +137,10 @@ class M1OrderLineFragment : fun showSelectData() { UiThreadHandler.post { - g_lines_sites_data.visibility = View.VISIBLE - g_loading_group.visibility = View.GONE - group_driver_agrenn_line.visibility = View.GONE - aciv_driver_refuse_group.visibility = View.GONE + g_lines_sites_data?.visibility = View.VISIBLE + g_loading_group?.visibility = View.GONE + group_driver_agrenn_line?.visibility = View.GONE + aciv_driver_refuse_group?.visibility = View.GONE } } @@ -145,7 +149,7 @@ class M1OrderLineFragment : aciv_driver_refuse_group.visibility = View.GONE g_loading_group.visibility = View.GONE g_lines_sites_data.visibility = View.GONE - RxUtils.createSubscribe(3_000) { + subscribeDirverAgree = RxUtils.createSubscribe(3_000) { dismiss?.closeDialog() } } @@ -154,7 +158,7 @@ class M1OrderLineFragment : aciv_driver_refuse_group.visibility = View.VISIBLE g_loading_group.visibility = View.GONE g_lines_sites_data.visibility = View.GONE - RxUtils.createSubscribe(3_000) { + subscribeDirverRefuse = RxUtils.createSubscribe(3_000) { showSelectData() } } @@ -194,6 +198,8 @@ class M1OrderLineFragment : super.onDestroyView() //loadingAni.cancel() CallerLogger.d(SceneConstant.M_BUS_P + TAG, "onDestroyView") + RxUtils.disposeSubscribe(subscribeDirverAgree) + RxUtils.disposeSubscribe(subscribeDirverRefuse) } fun lineAdapterSubmit(lineInfo: LineInfoResponse.LineInfo) {