diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java index b3747cebc7..118dbfe391 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java @@ -684,7 +684,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback phoneTail, new TaxiPassengerServiceCallback() { @Override public void onSuccess(TaxiPassengerBaseRespBean data) { - ToastUtils.showLong("验证成功"); if(commonCallback!=null) { commonCallback.onCommonCallback(); } @@ -697,7 +696,8 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback @Override public void onFail(int code, String msg) { - ToastUtils.showLong("onFail"+code+msg); + ToastUtils.showLong("当前网络异常,请重新验证;若始终异常,请您在手机端取消行程,给您带来不便,十分抱歉!"); + CallerLogger.INSTANCE.e(TAG,"提交用户输入的手机后4位、并进行状态扭转 后台结果错误"+code+msg); } }); } @@ -708,7 +708,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback new TaxiPassengerServiceCallback() { @Override public void onSuccess(TaxiPassengerBaseRespBean data) { - ToastUtils.showLong("评分成功"); if(commonCallback!=null) { commonCallback.onCommonCallback(true); } @@ -717,6 +716,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback @Override public void onError() { ToastUtils.showLong("网络错误请稍后再试"); + CallerLogger.INSTANCE.e(TAG,"对订单进行打分 1-5分 网络错误"); if(commonCallback!=null) { commonCallback.onCommonCallback(false); } @@ -724,7 +724,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback @Override public void onFail(int code, String msg) { - ToastUtils.showLong(msg); + CallerLogger.INSTANCE.e(TAG,"对订单进行打分 1-5分 后台结果错误"+code+msg); if(commonCallback!=null) { commonCallback.onCommonCallback(false); } 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 index 9238bd5744..c1655da236 100644 --- 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 @@ -262,13 +262,14 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { override fun onAnimationEnd(p0: Animation?) { ochShadowLayout.visibility = View.GONE ochThankShadowLayout.startAnimation(alphaAnimation) + ivAnimalList.startAnimation(alphaAnimation) alphaAnimation.setAnimationListener(object : PoiInputSearchWidget.AnimationListenerAdapter(){ override fun onAnimationStart(p0: Animation?) { ochThankShadowLayout.visibility = View.VISIBLE + ivAnimalList.visibility = View.VISIBLE showThanks = true } override fun onAnimationEnd(p0: Animation?) { - ivAnimalList.visibility = View.VISIBLE val animationDrawable = ivAnimalList.drawable as AnimationDrawable animationDrawable.start() } @@ -282,13 +283,7 @@ class TaxiPassengerArrivedView :RelativeLayout, View.OnClickListener { .observeOn(AndroidSchedulers.mainThread()) .subscribe { // 正在展示感谢页面 - if (taxiPassengerCommonCallback == null) { - // 没有用户确定页面 - OverlayViewUtils.dismissOverlayView(this@TaxiPassengerArrivedView) - } else { - // 有排队展示的用户确定页面 - taxiPassengerCommonCallback?.onCommonCallback() - } + taxiPassengerCommonCallback?.onCommonCallback() } } 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 aa54f8d5ae..6a1cfb8ef5 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 @@ -296,20 +296,20 @@ public class TaxiPassengerBaseFragment extends MvpFragment { - showOrHideArrivedEndLayout(false, "",""); - showOrHidePressengerCheckPager(true, startSiteAddr, - endSiteAddr, passengerNum, carNumber, phone); - mArrivedEndView.get().setTaxiPassengerCommonCallback(null); - }); - }else { +// if (mArrivedEndView.get().getShowThanks()) { +// // 正在展示感谢页面 +// mArrivedEndView.get().setTaxiPassengerCommonCallback(() -> { +// showOrHideArrivedEndLayout(false, "",""); +// showOrHidePressengerCheckPager(true, startSiteAddr, +// endSiteAddr, passengerNum, carNumber, phone); +// mArrivedEndView.get().setTaxiPassengerCommonCallback(null); +// }); +// }else { // 正在展示打分页面 showOrHideArrivedEndLayout(false, "",""); showOrHidePressengerCheckPager(true, startSiteAddr, endSiteAddr, passengerNum, carNumber, phone); - } +// } } diff --git a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java index e893c97426..3cf0601a75 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java +++ b/OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java @@ -229,7 +229,7 @@ public class TaxiPassengerMapDirectionView //polylineOptions.colorValues(colorList); // 1FC3FF -> 57ABFF //加上这个属性,表示使用渐变线 //polylineOptions.useGradient(true); - polylineOptions.width(10); + polylineOptions.width(15); polylineOptions.lineCapType(PolylineOptions.LineCapType.LineCapRound); polylineOptions.setCustomTexture(BitmapDescriptorFactory.fromResource(R.drawable.taxi_p_map_arrow)); diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml new file mode 100644 index 0000000000..ceac4e6062 --- /dev/null +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml @@ -0,0 +1,3 @@ + + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml index 5d345730d9..dfe499b9b6 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml @@ -4,4 +4,5 @@ android:duration="142" android:fromXDelta="-110%" android:toXDelta="0"/> + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml b/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml index 18bc75b16e..39b17e037e 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml @@ -4,4 +4,5 @@ android:duration="142" android:fromXDelta="0" android:toXDelta="-110%"/> + \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png index 1297e5e7ae..baa35592cb 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png index 1297e5e7ae..baa35592cb 100644 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png and b/OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml index 06ec998707..530c056746 100644 --- a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml +++ b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml @@ -1,9 +1,7 @@ - - - @@ -37,6 +35,5 @@ android:oneshot="false"> - \ No newline at end of file diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00000.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00000.png deleted file mode 100755 index 16d7388c6a..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00000.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00002.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00002.png deleted file mode 100755 index 03911ae2af..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00002.png and /dev/null differ diff --git a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00069.png b/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00069.png deleted file mode 100755 index 5ac76f3089..0000000000 Binary files a/OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00069.png and /dev/null differ