diff --git a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index bb5184cdc8..6c0b279bf7 100644 --- a/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/taxi/driver/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -148,8 +148,6 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment mNoDatasTv = view.findViewById(R.id.no_order_data_tv); mNoDataView = view.findViewById(R.id.being_no_data_view); - dialog = new ItinerarySummaryDialog(getContext(),true,R.style.summary_dialog); - initOnClickListener(); initNaviView(view); @@ -510,6 +508,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if(dialog!=null&&dialog.isShowing()) { dialog.dismiss(); } + dialog = null; mOrderCancel.setVisibility(View.VISIBLE); VoiceNotice.showNotice(mActivity.getString(R.string.module_och_taxi_new_order)); mTtsLessThan200Tip = 0; @@ -524,6 +523,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if(dialog!=null&&dialog.isShowing()) { dialog.dismiss(); } + dialog = null; mCurrentOrder = null; mTtsLessThan200Tip = 0; isFirstStartAutopilotDone = true; @@ -538,6 +538,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if(dialog!=null&&dialog.isShowing()) { dialog.dismiss(); } + dialog = null; mTtsLessThan200Tip = 0; isFirstStartAutopilotDone = true; mOrderCancel.setVisibility(View.VISIBLE); @@ -554,6 +555,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if(dialog!=null&&dialog.isShowing()) { dialog.dismiss(); } + dialog = null; mOrderCancel.setVisibility(View.VISIBLE); if (mTaxiFragment != null) { showNaviToEndStationFragment(false); @@ -562,7 +564,10 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment setOrRemoveMapMaker(true, TaxiConst.TAXI_END_MAP_MAKER,order.endSitePoint,R.raw.end_marker); break; case ArriveAtEnd: - if(dialog!=null&&!dialog.isShowing()) { + if(dialog==null){ + dialog = new ItinerarySummaryDialog(getContext(),true,R.style.summary_dialog); + } + if(!dialog.isShowing()) { dialog.show(); } mTtsLessThan200Tip = 0; @@ -576,6 +581,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment if(dialog!=null&&dialog.isShowing()) { dialog.dismiss(); } + dialog = null; mCurrentOrder = null; mTtsLessThan200Tip = 0; isFirstStartAutopilotDone = true; diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt index 341310e459..9ecce7d4be 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/arrived/ArrivedView.kt @@ -49,7 +49,7 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { private lateinit var viewModel: ArrivedViewModel - val dialog = ItinerarySummaryDialog(context,false,R.style.summary_dialog_p) + var dialog:ItinerarySummaryDialog? = null private fun initView() { @@ -74,7 +74,10 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { aniSpeedSettingRow() viewModel.setEndInfo() ZhiViewmanager.showListeningAni(ZhiViewmanager.loveAni) - dialog.show() + if(dialog==null) { + dialog = ItinerarySummaryDialog(context, false, R.style.summary_dialog_p) + } + dialog?.show() } else { v_video_right_rear_view.resetView() taxiPxiaozhiLove?.stop() @@ -82,7 +85,8 @@ class ArrivedView : WindowRelativeLayout, ArrivedViewModel.ArrivedViewCallback { taxiPxiaozhiLove = null RxUtils.disposeSubscribe(subscribe) ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni) - dialog.dismiss() + dialog?.dismiss() + dialog = null } arrivedVisilityChangeListenr?.isShow(isVisible) } diff --git a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt index d029f20170..c17806caf0 100644 --- a/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt +++ b/OCH/taxi/unmanned-driver/src/main/java/com/mogo/och/unmanned/taxi/ui/task/TaxiCurrentTaskFragment.kt @@ -104,9 +104,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), } override fun initViews() { - context?.let { - dialog = ItinerarySummaryDialog(it,true,R.style.summary_dialog) - } initOnClickListener() initContainerView(false) initTaskDebugViewListener() @@ -842,11 +839,20 @@ class TaxiCurrentTaskFragment : BaseFragment(), } private fun showDialog(){ - dialog?.let { - if(!it.isShowing){ - it.show() + if(dialog==null&&context!=null){ + + } + context?.let { + if(dialog==null) { + dialog = ItinerarySummaryDialog(it, true, R.style.summary_dialog) + } + dialog?.let { dialogInner -> + if(!dialogInner.isShowing){ + dialogInner.show() + } } } + } private fun dismissDialog(){ dialog?.let { @@ -854,5 +860,6 @@ class TaxiCurrentTaskFragment : BaseFragment(), it.dismiss() } } + dialog = null } } \ No newline at end of file