From a594ad2092ca19f1db83d7317fd270a001e538e3 Mon Sep 17 00:00:00 2001
From: wangmingjun <wangmingjun@zhidaoauto.com>
Date: Thu, 21 Jul 2022 19:50:27 +0800
Subject: [PATCH] =?UTF-8?q?[282=20taxi=E5=8F=B8=E6=9C=BA=E7=AB=AF]=20?=
 =?UTF-8?q?=E5=A4=84=E7=90=86=E5=81=B6=E7=8E=B0=E5=86=85=E5=AD=98=E6=B3=84?=
 =?UTF-8?q?=E6=BC=8F=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/och/bus/presenter/BusLinePresenter.java |  5 ++++-
 .../com/mogo/och/bus/ui/BusSwitchLineActivity.java   | 12 ++++++++----
 2 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java
index dd0b333e67..c2f6fb57da 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/presenter/BusLinePresenter.java
@@ -64,6 +64,10 @@ public class BusLinePresenter extends Presenter<BusSwitchLineView> implements IB
         BusLineModel.getInstance().commitSwitchLineId(lineId);
     }
 
+    public void removeListener(){
+        BusLineModel.getInstance().setBusLinesCallback(null);
+    }
+
     public void queryBusRoutes(){
         BusOrderModel.getInstance().queryBusRoutes();
     }
@@ -71,6 +75,5 @@ public class BusLinePresenter extends Presenter<BusSwitchLineView> implements IB
     @Override
     public void onDestroy(@NonNull LifecycleOwner owner) {
         super.onDestroy(owner);
-        BusLineModel.getInstance().setBusLinesCallback(null);
     }
 }
diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
index d79dac12d9..847071ba49 100644
--- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
+++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
@@ -79,7 +79,7 @@ public class BusSwitchLineActivity extends MvpActivity<BusSwitchLineView, BusLin
 
         mLinesListView = findViewById(R.id.switch_line_rv);
         mLinesListView.setLayoutManager(new LinearLayoutManager(this));
-        mAdapter = new SwitchLineAdapter(this,mData);
+        mAdapter = new SwitchLineAdapter(getApplicationContext(),mData);
         mLinesListView.setAdapter(mAdapter);
         //设置item 点击事件
         mAdapter.setOnLineItemClickListener(new LineItemClickListener() {
@@ -158,6 +158,10 @@ public class BusSwitchLineActivity extends MvpActivity<BusSwitchLineView, BusLin
     public void onChangeLineIdSuccess(){
         ToastUtils.showLong(getResources().getString(R.string.bus_change_line_commit_tip_s));
         mPresenter.queryBusRoutes();
+        if (mAdapter != null){
+            mAdapter.setOnLineItemClickListener(null);
+        }
+        mPresenter.removeListener();
         finish();
     }
 
@@ -198,9 +202,6 @@ public class BusSwitchLineActivity extends MvpActivity<BusSwitchLineView, BusLin
     @Override
     protected void onDestroy() {
         super.onDestroy();
-        if (mAdapter != null){
-            mAdapter.setOnLineItemClickListener(null);
-        }
     }
 
     /**
@@ -255,6 +256,9 @@ public class BusSwitchLineActivity extends MvpActivity<BusSwitchLineView, BusLin
                 }
             }else {
                 if (line.choose == 1){//1:绑定 2:未绑定 默认绑定
+                    if (mItemClickListener != null) {
+                        mItemClickListener.onItemClick(position);
+                    }
                     holder.selectIv.setImageResource(R.drawable.bus_selected_btn);
                 }else {
                     holder.selectIv.setImageResource(R.drawable.bus_unselect_btn);