diff --git a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java index c6e979d82f..fabef08b13 100644 --- a/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java +++ b/OCH/bus/driver/src/main/java/com/mogo/och/bus/model/OrderModel.java @@ -1267,6 +1267,26 @@ public class OrderModel { return parameters; } + public void setStation(){ + BusStationBean busStationBean = stationList.get(backgroundCurrentStationIndex); + String nextStationName = ""; + String nextStationNameKr = ""; + MogoLocation nextStationPoint = new MogoLocation(); + if (backgroundCurrentStationIndex < stationList.size() - 1) { + BusStationBean nextStation = stationList.get(backgroundCurrentStationIndex + 1); + nextStationName = nextStation.getName(); + nextStationNameKr = nextStation.getNameKr(); + nextStationPoint.setLongitude(nextStation.getGcjLon()); + nextStationPoint.setLatitude(nextStation.getGcjLat()); + } + final String currentStationName = busStationBean.getName(); + String finalNextStationName = nextStationName; + String finalNextStationNameKr = nextStationNameKr; + MogoLocation currentStationPoint = new MogoLocation(); + currentStationPoint.setLongitude(busStationBean.getGcjLon()); + currentStationPoint.setLatitude(busStationBean.getGcjLat()); + } + public void setTrajectoryStation(MogoLocation startStation,MogoLocation endStation,Long lineId){ TrajectoryAndDistanceManager.INSTANCE.setStationPoint(startStation,endStation,lineId); } diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index e0d1c6eec4..1d0f2a05ce 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -454,6 +454,10 @@ class TaxiPassengerBaseFragment() : arrivedView.preLoadImages() } + fun setEvaluateView(){ + evaluate.visibility = View.VISIBLE + } + companion object { @JvmField diff --git a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt index 5ea01bd6a5..6e6846488e 100644 --- a/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ b/OCH/taxi/passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt @@ -19,6 +19,7 @@ import com.mogo.och.common.module.manager.debug.DebugViewWatchDogFragment import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_arrive +import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_evaluate import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_order_info import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_phone_check import kotlinx.android.synthetic.main.taxi_p_debug.view.tv_show_start_autopilot @@ -77,7 +78,9 @@ class DebugView @JvmOverloads constructor( fragment?.showOrHideServingOrderFragment(true) fragment?.preLoadArrivedImages() } - + tv_show_evaluate.onClick { + fragment?.setEvaluateView() + } } @Subscribe(threadMode = ThreadMode.MAIN) fun changeOverview(debugEvent: DebugEvent) { diff --git a/OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml b/OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml index 525df7b56e..a3eea40080 100644 --- a/OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml +++ b/OCH/taxi/passenger/src/main/res/layout/taxi_p_debug.xml @@ -35,5 +35,10 @@ android:text="订单信息" android:layout_width="wrap_content" android:layout_height="wrap_content"/> + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt index 07f4b5e951..ab54fe0314 100644 --- a/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt +++ b/OCH/taxi/pcommon/src/main/java/com/mogo/och/taxi/passenger/ui/evaluate/EvaluateView.kt @@ -11,13 +11,13 @@ import androidx.lifecycle.findViewTreeViewModelStoreOwner import com.mogo.commons.voice.AIAssist import com.mogo.eagle.core.utilcode.kotlin.onClick import com.mogo.och.common.module.manager.xiaozhimanager.ZhiViewmanager +import com.mogo.och.common.module.utils.FrameAnimatorContainer import com.mogo.och.common.module.utils.RxUtils import com.mogo.och.common.module.voice.VoiceNotice import com.mogo.och.taxi.passenger.common.R import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_close import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_great import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_evaluate_low -import kotlinx.android.synthetic.main.taxi_p_evaluate.view.iv_taxt_p_greate_text class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { @@ -36,30 +36,35 @@ class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { private var viewModel: EvaluateViewModel?=null + private var ivEvaluateGreatAni: FrameAnimatorContainer?=null + private fun initView() { LayoutInflater.from(context).inflate(R.layout.taxi_p_evaluate, this, true) iv_evaluate_great.onClick { if(isFirat){ - iv_evaluate_great.pivotX = (iv_evaluate_great.width / 2).toFloat() - iv_evaluate_great.pivotY = iv_evaluate_great.height.toFloat() - iv_evaluate_great.animate().scaleY(1.7f).scaleX(1.7f).setListener(object - :AnimatorListenerAdapter() { - override fun onAnimationStart(animation: Animator) { - VoiceNotice.showNotice("感谢您的认可，我们会再接再厉", AIAssist.LEVEL2) - iv_taxt_p_greate_text.animate().alpha(1f).duration = 1000 - // 小智爱心动作 - ZhiViewmanager.showListeningAni(ZhiViewmanager.loveAni) - RxUtils.createSubscribe(3_000) { - visibility = GONE - iv_taxt_p_greate_text.alpha = 0f - //恢复默认大小 - iv_evaluate_great.scaleX = 1.0f - iv_evaluate_great.scaleY = 1.0f - // 小智回归默认动作 - ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni,false) - } + if(ivEvaluateGreatAni==null) { + ivEvaluateGreatAni = + FrameAnimatorContainer(R.array.taxi_p_arrive_dest_great, 31, iv_evaluate_great, isOnce = true) + ivEvaluateGreatAni?.start() + + }else{ + ivEvaluateGreatAni?.reStart() + } + ivEvaluateGreatAni?.setOnAnimStopListener(object : + FrameAnimatorContainer.OnAnimationStoppedListener { + override fun AnimationStopped() { + } - }).duration = 1000 + }) + VoiceNotice.showNotice("感谢您的认可，我们会再接再厉", AIAssist.LEVEL2) + // 小智爱心动作 + ZhiViewmanager.showListeningAni(ZhiViewmanager.loveAni) + RxUtils.createSubscribe(3_000) { + visibility = GONE + // 小智回归默认动作 + ZhiViewmanager.showListeningAni(ZhiViewmanager.normalAni,false) + } + isFirat = false } } @@ -68,7 +73,7 @@ class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { if(isFirat){ iv_evaluate_low.pivotX = (iv_evaluate_low.width / 2).toFloat() iv_evaluate_low.pivotY = iv_evaluate_low.height.toFloat() - iv_evaluate_low.animate().scaleY(1.7f).scaleX(1.7f).setListener(object : + iv_evaluate_low.animate().scaleY(1.2f).scaleX(1.2f).setListener(object : AnimatorListenerAdapter() { override fun onAnimationStart(animation: Animator) { VoiceNotice.showNotice("感谢您的反馈，我们会继续努力！", AIAssist.LEVEL2) @@ -97,7 +102,7 @@ class EvaluateView : ConstraintLayout, EvaluateViewModel.EvaluateCallback { isFirat = true VoiceNotice.showNotice("行程即将结束咯～小智很想知道您的体验如何呢", AIAssist.LEVEL2) }else{ - iv_evaluate_great.scaleX = 1f + iv_evaluate_great.setImageResource(R.drawable.arrive_dest_great_000) iv_evaluate_low.scaleY = 1f isFirat = true } diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_000.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_000.png new file mode 100644 index 0000000000..c72f538ec2 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_000.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_001.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_001.png new file mode 100644 index 0000000000..2a1b9775b6 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_001.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_002.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_002.png new file mode 100644 index 0000000000..168cdf8441 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_002.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_003.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_003.png new file mode 100644 index 0000000000..93e1137ece Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_003.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_004.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_004.png new file mode 100644 index 0000000000..d22b5bfa22 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_004.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_005.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_005.png new file mode 100644 index 0000000000..8a7ccb34d6 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_005.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_006.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_006.png new file mode 100644 index 0000000000..f46c00d0e9 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_006.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_007.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_007.png new file mode 100644 index 0000000000..b4f6dbec91 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_007.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_008.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_008.png new file mode 100644 index 0000000000..618aa81565 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_008.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_009.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_009.png new file mode 100644 index 0000000000..f46c00d0e9 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_009.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_010.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_010.png new file mode 100644 index 0000000000..168cdf8441 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_010.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_011.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_011.png new file mode 100644 index 0000000000..8a7ccb34d6 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_011.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_012.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_012.png new file mode 100644 index 0000000000..4b4889576a Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_012.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_013.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_013.png new file mode 100644 index 0000000000..d22b5bfa22 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_013.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_014.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_014.png new file mode 100644 index 0000000000..4b4889576a Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_014.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_015.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_015.png new file mode 100644 index 0000000000..8a7ccb34d6 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_015.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_016.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_016.png new file mode 100644 index 0000000000..168cdf8441 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_016.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_017.png b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_017.png new file mode 100644 index 0000000000..168cdf8441 Binary files /dev/null and b/OCH/taxi/pcommon/src/main/res/ani/drawable-nodpi/arrive_dest_great_017.png differ diff --git a/OCH/taxi/pcommon/src/main/res/ani/values/arrays.xml b/OCH/taxi/pcommon/src/main/res/ani/values/arrays.xml index 92800a6a52..1dfcf8e5e6 100644 --- a/OCH/taxi/pcommon/src/main/res/ani/values/arrays.xml +++ b/OCH/taxi/pcommon/src/main/res/ani/values/arrays.xml @@ -279,4 +279,27 @@ + + + @drawable/arrive_dest_great_001 + @drawable/arrive_dest_great_002 + @drawable/arrive_dest_great_003 + @drawable/arrive_dest_great_004 + @drawable/arrive_dest_great_005 + @drawable/arrive_dest_great_006 + @drawable/arrive_dest_great_007 + @drawable/arrive_dest_great_008 + @drawable/arrive_dest_great_009 + + @drawable/arrive_dest_great_010 + @drawable/arrive_dest_great_011 + @drawable/arrive_dest_great_012 + @drawable/arrive_dest_great_013 + @drawable/arrive_dest_great_014 + @drawable/arrive_dest_great_015 + @drawable/arrive_dest_great_016 + @drawable/arrive_dest_great_017 + + + \ No newline at end of file diff --git a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml index af51cb9123..926249621d 100644 --- a/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml +++ b/OCH/taxi/pcommon/src/main/res/layout/taxi_p_evaluate.xml @@ -7,7 +7,9 @@ tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + - - - - + + + \ No newline at end of file diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt index 267f1d5457..58357b8e4c 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.kt @@ -302,6 +302,9 @@ class TaxiPassengerBaseFragment() : overMapView.setDebugMode(true) showOrHide(true,"Debug 按钮") } + fun setEvaluateView(){ + evaluate.visibility = View.VISIBLE + } /** * 显示或者隐藏到达乘客站点的洁面 diff --git a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt index 12aba432c6..a1bc3599be 100644 --- a/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt +++ b/OCH/taxi/unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/debug/DebugView.kt @@ -11,8 +11,8 @@ import com.mogo.eagle.core.utilcode.util.ActivityUtils import com.mogo.och.taxi.passenger.R import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_arrive +import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_evaluate import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_order_info -import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_overmap_debug import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_phone_check import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_start_autopilot import kotlinx.android.synthetic.main.taxt_u_p_debug.view.tv_show_start_autopilot_success @@ -66,9 +66,8 @@ class DebugView @JvmOverloads constructor( tv_show_start_autopilot_success.onClick { fragment?.showOrHideCheckAndStartAutopilotView(2) } - tv_show_overmap_debug.onClick { - fragment?.setOverMapDebug() - fragment?.preLoadArrivedImages() + tv_show_evaluate.onClick { + fragment?.setEvaluateView() } } @Subscribe(threadMode = ThreadMode.MAIN) diff --git a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml index 6b19212a29..2fb8e73431 100644 --- a/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml +++ b/OCH/taxi/unmanned-passenger/src/main/res/layout/taxt_u_p_debug.xml @@ -43,6 +43,11 @@ android:layout_width="wrap_content" android:layout_height="wrap_content"/> + \ No newline at end of file