From 14750383bef6dcc22eca7573a8c76f17384bb9a5 Mon Sep 17 00:00:00 2001
From: yangyakun <yangyakun@zhidaoauto.com>
Date: Mon, 15 May 2023 15:21:50 +0800
Subject: [PATCH] =?UTF-8?q?[charter]=20[3.2.0]=20[=E5=BB=B6=E6=97=B6?=
 =?UTF-8?q?=E6=93=8D=E4=BD=9C=E9=9C=80=E8=A6=81=E8=AE=BE=E7=BD=AE=E5=8F=96?=
 =?UTF-8?q?=E6=B6=88]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../fragment/M1OrderLineFragment.kt            | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

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<LineInfoResponse.LineInfo>()
     val siteList = mutableListOf<SiteInfoResponse.SiteInfo>()
 
+    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) {