From 745bce7a29a7a98c2ca07290f66e4b030323a570 Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Thu, 24 Aug 2023 11:42:14 +0800 Subject: [PATCH] =?UTF-8?q?[6.0.0]=20=E9=87=8D=E6=9E=84=E4=BB=A3=E7=A0=81?= =?UTF-8?q?=E5=90=8E=E5=8F=96=E6=B6=88=E8=AE=A2=E5=8D=95=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E8=A7=A3=E5=86=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java | 5 +---- .../com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt | 4 ++-- 2 files changed, 3 insertions(+), 6 deletions(-) diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java index a86a8f2edd..0d595b0099 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java @@ -6,7 +6,6 @@ import android.app.AlertDialog; import android.content.Context; import android.graphics.Color; import android.graphics.drawable.ColorDrawable; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.Display; @@ -21,8 +20,6 @@ import android.widget.BaseAdapter; import android.widget.GridView; import android.widget.TextView; -import androidx.annotation.RequiresApi; - import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger; import com.mogo.eagle.core.utilcode.util.ToastUtils; import com.mogo.och.taxi.constant.TaxiOrderStatusEnum; @@ -149,7 +146,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi mContentAdapter.notifyCurrentReasons(mCurrentReason); } - interface CommitReasonListener{ + public interface CommitReasonListener{ void cancelCurOrder(int type); } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt index ae99c9c22a..3e79670915 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -654,8 +654,8 @@ class TaxiCurrentTaskFragment : BaseFragment(), activity?.also { TaxiOrderCancelDialog( it, mCurrentTaskWithOrder!!.order!!.orderStatus - ) { - mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(it)) + ) {type -> + mViewModel.sendUiIntent(UnmannedIntent.CancelOrder(type)) }.show() } }