yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/dev_robotaxi-d-app-module_270_220510_2.7.0' into dev_robotaxi-d-app-module_270_220510_2.7.0

Browse Source
This commit is contained in:
xinfengkun
2022-05-24 18:57:37 +08:00
parent aadc426a2c b1c24851ae
commit 7968d21d91
13 changed files with 24 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModel.java
View File

@@ -684,7 +684,6 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
phoneTail, new TaxiPassengerServiceCallback<TaxiPassengerBaseRespBean>() {
@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<TaxiPassengerBaseRespBean>() {
@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);
}

11
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerArrivedView.kt
View File

@@ -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()
}
}

20
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerBaseFragment.java
View File

@@ -296,20 +296,20 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
showOrHidePressengerCheckPager(true, startSiteAddr,
endSiteAddr, passengerNum, carNumber, phone);
}else {
if (mArrivedEndView.get().getShowThanks()) {
// 正在展示感谢页面
mArrivedEndView.get().setTaxiPassengerCommonCallback(() -> {
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);
}
// }
}

2
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/ui/TaxiPassengerMapDirectionView.java
View File

@@ -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));

3
OCH/mogo-och-taxi-passenger/src/main/res/anim/alpha_show_hide.xml Normal file
View File

@@ -0,0 +1,3 @@
<?xml version="1.0" encoding="utf-8"?>
<alpha xmlns:android="http://schemas.android.com/apk/res/android"
android:duration="1000" android:fromAlpha="1" android:toAlpha="0" />

1
OCH/mogo-och-taxi-passenger/src/main/res/anim/left_to_right.xml
View File

@@ -4,4 +4,5 @@
android:duration="142"
android:fromXDelta="-110%"
android:toXDelta="0"/>
<alpha android:fromAlpha="0.0" android:toAlpha="1.0" android:duration="142" />
</set>

1
OCH/mogo-och-taxi-passenger/src/main/res/anim/right_to_left.xml
View File

@@ -4,4 +4,5 @@
android:duration="142"
android:fromXDelta="0"
android:toXDelta="-110%"/>
<alpha android:fromAlpha="1.0" android:toAlpha="0.0" android:duration="142" />
</set>

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi-2560x1440/taxi_p_map_arrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 497 B

After

Width:  |  Height:  |  Size: 588 B

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable-xhdpi/taxi_p_map_arrow.png
View File

Binary file not shown.
Side by Side Swipe Overlay

Before

Width:  |  Height:  |  Size: 497 B

After

Width:  |  Height:  |  Size: 588 B

5
OCH/mogo-och-taxi-passenger/src/main/res/drawable/bg_taxi_score_success.xml
View File

@@ -1,9 +1,7 @@
<?xml version="1.0" encoding="utf-8"?>
<animation-list xmlns:android="http://schemas.android.com/apk/res/android"
<animation-list xmlns:android="http://schemas.android.com/apk/res/android" android:visible="true"
android:oneshot="false">
<item android:drawable="@drawable/hand_00000" android:duration="60"/>
<item android:drawable="@drawable/hand_00002" android:duration="60"/>
<item android:drawable="@drawable/hand_00004" android:duration="60"/>
<item android:drawable="@drawable/hand_00006" android:duration="60"/>
<item android:drawable="@drawable/hand_00008" android:duration="60"/>
@@ -37,6 +35,5 @@ android:oneshot="false">
<item android:drawable="@drawable/hand_00064" android:duration="60"/>
<item android:drawable="@drawable/hand_00066" android:duration="60"/>
<item android:drawable="@drawable/hand_00068" android:duration="60"/>
<item android:drawable="@drawable/hand_00069" android:duration="60"/>
</animation-list>

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00000.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 156 B

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00002.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 22 KiB

BIN
OCH/mogo-och-taxi-passenger/src/main/res/drawable/hand_00069.png
View File

Binary file not shown.
Side by Side

Before

Width:  |  Height:  |  Size: 25 KiB