From d871b31954830a40df1e6372a2b5380eb978f0d5 Mon Sep 17 00:00:00 2001
From: lianglihui <lianglihui@zhidaoauto.com>
Date: Thu, 24 Jun 2021 16:15:04 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BD=91=E7=BA=A6=E8=BD=A6=20Cancel=20Complete?=
 =?UTF-8?q?d=E7=8A=B6=E6=80=81=E4=B8=8B=20UI=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java   | 3 ++-
 .../src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java | 6 +++++-
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
index 8c0d302ec0..1a59d6bc6b 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/MogoOCHTaxiModel.java
@@ -620,7 +620,8 @@ class MogoOCHTaxiModel {
             switch ( status ) {
                 case Cancel:
                     clearCurrentOCHOrder();
-                    OCHTaxiUiController.getInstance().removeFragment();
+//                    OCHTaxiUiController.getInstance().removeFragment();
+                    OCHTaxiUiController.getInstance().onOrderStatusChanged(status.getCode());
                     break;
                 case UserArriveAtStartStation:
                     mIsArriveAtStartStation = true;
diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
index ad814460dd..8c919f046e 100644
--- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
+++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/OCHTaxiFragment.java
@@ -407,7 +407,11 @@ class OCHTaxiFragment extends BaseOchFragment< OCHTaxiView, OCHTaxiPresenter > i
     @Override
     public void onOrderStatusChanged(int status) {
         getActivity().runOnUiThread(() -> {
-            getPanelView().setVisibility(status != 0 ? View.VISIBLE : View.INVISIBLE);
+            if (status == OCHOrderStatus.None.getCode() || status == OCHOrderStatus.Cancel.getCode() || status == OCHOrderStatus.Completed.getCode() ){
+                getPanelView().setVisibility(View.INVISIBLE);
+            }else {
+                getPanelView().setVisibility(View.VISIBLE);
+            }
             updateOrderStatus();
         });
     }