From e0072df5d4f986f6a18e8f4430d516a822ac0be4 Mon Sep 17 00:00:00 2001 From: yangyakun Date: Mon, 16 May 2022 19:54:03 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=93=E6=9D=9F=E9=A1=B5=E9=9D=A2=E6=8A=BD?= =?UTF-8?q?=E5=8F=96=E6=88=90=E7=8B=AC=E7=AB=8BView=20=E6=B7=BB=E5=8A=A0de?= =?UTF-8?q?bug=E4=BD=8D=E7=BD=AE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../ITaxiPassengerCommonValueCallback.java | 5 ++ .../passenger/ui/TaxiPassengerArrivedView.kt | 78 +++++++++++++++++++ .../ui/TaxiPassengerBaseFragment.java | 39 +++++----- .../passenger/ui/TaxiPassengerCheckView.kt | 6 ++ 4 files changed, 109 insertions(+), 19 deletions(-) create mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java create mode 100644 OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java new file mode 100644 index 0000000000..157925b458 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/callback/ITaxiPassengerCommonValueCallback.java @@ -0,0 +1,5 @@ +package com.mogo.och.taxi.passenger.callback; + +public interface ITaxiPassengerCommonValueCallback { + void onCommonCallback(T t); +} diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt new file mode 100644 index 0000000000..601d466e15 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt @@ -0,0 +1,78 @@ +package com.mogo.och.taxi.passenger.ui + +import android.content.Context +import android.util.AttributeSet +import android.view.LayoutInflater +import android.view.View +import android.view.animation.AnimationUtils +import android.widget.RelativeLayout +import android.widget.TextView +import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger.d +import com.mogo.eagle.core.utilcode.mogo.logger.scene.SceneConstant +import com.mogo.eagle.core.utilcode.util.OverlayViewUtils +import com.mogo.och.common.module.wigets.OCHBorderShadowLayout +import com.mogo.och.taxi.passenger.R +import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonValueCallback + +/** + * + * 评价View + * Created on 2022/5/16 + */ +class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { + + constructor(context: Context?) : super(context) + + constructor(context: Context?, attributeSet: AttributeSet) : super(context, attributeSet) + + constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int) : super(context, attributeSet, defStyleAttr) + + constructor(context: Context?, attributeSet: AttributeSet, defStyleAttr: Int, defStyleRes: Int) : super(context, attributeSet, defStyleAttr, defStyleRes) + + companion object { + const val TAG = "TaxiPassengerArrivedView" + } + + init { + try { + initView(context) + } catch (e: Exception) { + e.printStackTrace() + } + } + private lateinit var mArrivedEndStation: TextView + private lateinit var ochShadowLayout: OCHBorderShadowLayout + + var taxiPassengerCommonValueCallback: ITaxiPassengerCommonValueCallback?=null + var trAnimation = AnimationUtils.loadAnimation( + context, R.anim.left_to_right + ) + + private fun initView(context: Context) { + d(SceneConstant.M_TAXI_P + TAG, "initView") + LayoutInflater.from(context).inflate(R.layout.taxi_p_arrived_end_panel, this, true) + mArrivedEndStation = findViewById(R.id.arrived_end_station) + ochShadowLayout = findViewById(R.id.och_shadow_layout) + findViewById(R.id.tv_please_score).setOnClickListener(this) + findViewById(R.id.arrived_end_station_title).setOnLongClickListener { + OverlayViewUtils.dismissOverlayView(this) + false + } + } + + override fun onClick(v: View?) { + when (v?.id) { + R.id.tv_taxi_passenger_number_one -> { + taxiPassengerCommonValueCallback?.onCommonCallback(2) + } + else -> {} + } + } + + + + fun setDataAndStartAnimation(endSiteAddr: String?) { + mArrivedEndStation.text = endSiteAddr + ochShadowLayout.startAnimation(trAnimation) + } +} \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java index 1f07fa6df6..f0188aeb32 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java @@ -27,6 +27,7 @@ import com.mogo.map.uicontroller.VisualAngleMode; import com.mogo.module.common.MogoApisHandler; import com.mogo.module.common.constants.DataTypes; import com.mogo.och.taxi.passenger.R; +import com.mogo.och.taxi.passenger.callback.ITaxiPassengerCommonValueCallback; import com.mogo.och.taxi.passenger.presenter.BaseTaxiPassengerPresenter; import java.lang.ref.WeakReference; @@ -51,10 +52,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment mArrivedEndView; - private WeakReference ochShadowLayout; + private WeakReference mArrivedEndView; private WeakReference mArrivedCheckView; - private WeakReference mArrivedEndStation; protected TaxiPassengerServingOrderFragment ochServingOrderFragment = null; @@ -84,7 +83,6 @@ public class TaxiPassengerBaseFragment extends MvpFragment(mArrivedEndViewInner); - mArrivedEndStation = new WeakReference<>(mArrivedEndViewInner.findViewById(R.id.arrived_end_station)) ; - ochShadowLayout = new WeakReference<>(mArrivedEndViewInner.findViewById(R.id.och_shadow_layout)) ; - mArrivedEndViewInner.findViewById(R.id.tv_please_score).setOnClickListener(new View.OnClickListener() { + findViewById(R.id.iv_temp).setOnLongClickListener(new View.OnLongClickListener() { + int i = 0; @Override - public void onClick(View v) { - getPresenter().arrivedAndScore(2); + public boolean onLongClick(View v) { + if(i%2==0){ + showOrHideArrivedEndLayout(true,"北京北京北京"); + }else { + showOrHidePressengerCheckPager(true, "开始站点开", "开始站点开始站点开始", "2", "京A888888", "18811539480"); + } + i++; + return false; } }); } + private void initArrivedView(){ + mArrivedEndView = new WeakReference<>(new TaxiPassengerArrivedView(getContext())); + mArrivedEndView.get().setTaxiPassengerCommonValueCallback(integer -> getPresenter().arrivedAndScore(integer)); + } + private void initCheckView() { - TaxiPassengerCheckView mArrivedCheckViewInner = new TaxiPassengerCheckView(getContext()); - mArrivedCheckView = new WeakReference<>(mArrivedCheckViewInner); + mArrivedCheckView = new WeakReference<>(new TaxiPassengerCheckView(getContext())); mArrivedCheckView.get().setOnCheckPhoneAndUpdateStatusListener(phoneTail -> getPresenter().checkAndUpdateStatus(phoneTail)); } @@ -273,13 +276,11 @@ public class TaxiPassengerBaseFragment extends MvpFragment(R.id.tv_hello).setOnLongClickListener { + OverlayViewUtils.dismissOverlayView(this) + false + } } override fun onClick(v: View?) {