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

[taxi/bus-d 270] 1、taxi/bus 网络请求弹框修改 2、乘客屏网络状态修改

Browse Source
This commit is contained in:
wangmingjun
2022-06-08 20:25:17 +08:00
parent ebe24265e0
commit 0bad7a6551
15 changed files with 92 additions and 73 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
View File

@@ -238,9 +238,7 @@ public class BusPassengerModel {
CallerLogger.INSTANCE.d( M_BUS_P + TAG, "onIntentReceived = %s", intentStr );
if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) {
if ( NetworkUtils.isConnected( mContext ) ) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
queryDriverOperationStatus();
}
queryDriverOperationStatus();
}
}
}
@@ -332,7 +330,7 @@ public class BusPassengerModel {
// TODO: 2022/3/31
if (DebugConfig.isDebug()) {
// TipToast.shortTip("到达目的地");
// ToastUtils.showShort("到达目的地");
}
if (mADASStatusCallback != null){
mADASStatusCallback.onAutopilotArriveEnd();

5
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BaseBusTabFragment.java
View File

@@ -33,6 +33,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMapUIController;
import com.mogo.map.MogoMarkerManager;
@@ -162,7 +163,7 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState() != IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE){
restartAutopilot();
}else {
TipToast.shortTip(getResources().getString(R.string.bus_auto_disable_tip));
ToastUtils.showShort(getResources().getString(R.string.bus_auto_disable_tip));
}
}
});
@@ -224,6 +225,8 @@ public abstract class BaseBusTabFragment<V extends IView, P extends Presenter<V>
mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_long);
} else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
} else {
mSwitchMapModeImage.setImageResource(R.drawable.bus_switch_map_medium);
}
}

7
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java
View File

@@ -17,6 +17,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListener
import com.mogo.eagle.core.function.call.map.CallerHDMapManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.map.MogoMarkerManager;
import com.mogo.map.marker.IMogoMarker;
import com.mogo.map.marker.MogoMarkerOptions;
@@ -72,7 +73,7 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
if (DebugConfig.isDebug()) {
mBus.setOnClickListener(view -> {
TipToast.shortTip("重置了车站状态");
ToastUtils.showShort("重置了车站状态");
mPresenter.queryBusRoutes();
});
@@ -361,11 +362,11 @@ public class BusFragment extends BaseBusTabFragment<BusFragment, BusPresenter>
//本次行程未结束，不支持切换路线。点击则toast提示：当前行程未完成，不可切换路线
if (CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()
== IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING) {
TipToast.longTip(getResources().getString(R.string.bus_switch_line_btn_warning1));
ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning1));
return;
}
if (mCurrentStation > 0) {
TipToast.longTip(getResources().getString(R.string.bus_switch_line_btn_warning2));
ToastUtils.showLong(getResources().getString(R.string.bus_switch_line_btn_warning2));
return;
}
Intent intent = new Intent(getContext(), BusSwitchLineActivity.class);

9
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java
View File

@@ -5,6 +5,7 @@ import android.content.Context;
import com.mogo.commons.AbsMogoApplication;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.bean.BusRoutesResponse;
import com.mogo.och.bus.callback.IBusLinesCallback;
@@ -55,9 +56,9 @@ public class BusLineModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort("网络异常，请稍后重试");
}else {
TipToast.longTip("查询所有绑定路线失败:"+failMsg);
ToastUtils.showShort("查询所有绑定路线失败:"+failMsg);
}
}
});
@@ -75,9 +76,9 @@ public class BusLineModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort("网络异常，请稍后重试");
}else {
TipToast.longTip("切换路线失败:"+failMsg);
ToastUtils.showShort("切换路线失败:"+failMsg);
}
}
});

31
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
View File

@@ -29,6 +29,7 @@ import com.mogo.eagle.core.function.call.autopilot.CallerAutopilotPlanningListen
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.module.common.MogoApisHandler;
@@ -459,9 +460,9 @@ public class BusOrderModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort("网络异常，请稍后重试");
}else{
TipToast.longTip("离站上报失败:"+failMsg);
ToastUtils.showShort("离站上报失败:"+failMsg);
}
}
});
@@ -505,7 +506,7 @@ public class BusOrderModel {
// if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE
// == CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) {
// TipToast.shortTip("自动驾驶状态为不可用！");
// ToastUtils.showShort("自动驾驶状态为不可用！");
// }
AutopilotControlParameters currentAutopilot = new AutopilotControlParameters();
currentAutopilot.isSpeakVoice = !isRestart;
@@ -547,11 +548,11 @@ public class BusOrderModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
}else {
TipToast.longTip("离站上报失败:"+failMsg);
}
// if (!NetworkUtils.isConnected(mContext)) {
// ToastUtils.showShort("网络异常，请稍后重试");
// }else {
// ToastUtils.showShort("离站上报失败:"+failMsg);
// }
}
});
@@ -607,9 +608,9 @@ public class BusOrderModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort("网络异常，请稍后重试");
}else {
TipToast.shortTip("收车失败："+failMsg);
ToastUtils.showShort("收车失败："+failMsg);
}
}
});
@@ -634,9 +635,9 @@ public class BusOrderModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort("网络异常，请稍后重试");
}else {
TipToast.shortTip("出车失败："+failMsg);
ToastUtils.showShort("出车失败："+failMsg);
}
}
});
@@ -661,11 +662,11 @@ public class BusOrderModel {
@Override
public void onFail(String failMsg) {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort("网络异常，请稍后重试");
}else {
TipToast.shortTip("出车收车状态查询："+failMsg);
ToastUtils.showShort("出车收车状态查询："+failMsg);
}
queryOperationStatus();
// queryOperationStatus();
}
});
}

3
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/ui/BusSwitchLineActivity.java
View File

@@ -21,6 +21,7 @@ import androidx.recyclerview.widget.RecyclerView;
import com.mogo.commons.mvp.MvpActivity;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.bus.R;
import com.mogo.och.bus.bean.BusQueryLinesResponse;
import com.mogo.och.bus.presenter.BusLinePresenter;
@@ -156,7 +157,7 @@ public class BusSwitchLineActivity extends MvpActivity<BusSwitchLineView, BusLin
@Override
public void onChangeLineIdSuccess(){
TipToast.longTip(getResources().getString(R.string.bus_change_line_commit_tip_s));
ToastUtils.showLong(getResources().getString(R.string.bus_change_line_commit_tip_s));
mPresenter.queryBusRoutes();
finish();
}

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

@@ -427,9 +427,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
CallerLogger.INSTANCE.d( M_TAXI_P + TAG, "onIntentReceived = %s", intentStr );
if ( ConnectivityManager.CONNECTIVITY_ACTION.equals( intentStr ) ) {
if ( NetworkUtils.isConnected( mContext ) ) {
if (AppIdentityModeUtils.isDriver(FunctionBuildConfig.appIdentityMode)) {
startOrStopOrderLoop(true);
}
startOrStopOrderLoop(true);
}
}
}

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

@@ -96,6 +96,8 @@ public class TaxiPassengerBaseFragment extends MvpFragment<TaxiPassengerBaseFrag
mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_long);
} else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
}else {
mMapswitchBtn.setImageResource(R.drawable.taxi_p_switch_map_medium);
}
}
private void initListener(){

9
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/NaviToDestinationModel.java
View File

@@ -27,6 +27,7 @@ import com.autonavi.tbt.TrafficFacilityInfo;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.taxi.callback.ITaxiNaviChangedCallback;
import com.mogo.och.taxi.utils.PermissionUtil;
@@ -154,23 +155,23 @@ public class NaviToDestinationModel implements AMapNaviListener {
}
}
if (!NetworkUtils.isConnected(mContext) || result.getErrorCode() == 2){
TipToast.longTip("网络异常，请重试");
ToastUtils.showShort("网络异常，请重试");
if (mNaviChangedCallback != null){
mNaviChangedCallback.reInitNaviAmap(isPlay,false);
}
return;
}
if (!PermissionUtil.isLocServiceEnable(mContext) || !PermissionUtil.checkPermission(mContext,new String[]{Manifest.permission.ACCESS_FINE_LOCATION})){
TipToast.longTip("请开启车机定位后重试");
ToastUtils.showShort("请开启车机定位后重试");
if (mNaviChangedCallback != null){
mNaviChangedCallback.reInitNaviAmap(isPlay,false);
}
return;
}
// if (result.getErrorCode() == 3){
// TipToast.longTip("车辆当前坐标错误");
// ToastUtils.showShort("车辆当前坐标错误");
// }else if (result.getErrorCode() == 6){
// TipToast.longTip("终点坐标错误");
// ToastUtils.showShort("终点坐标错误");
// }
CallerLogger.INSTANCE.i(M_TAXI + "dm", "路线计算失败：错误码=" + result.getErrorCode() + ",Error Message= " + result.getErrorDetail());
CallerLogger.INSTANCE.i(M_TAXI + "dm", "错误码详细链接见：http://lbs.amap.com/api/android-navi-sdk/guide/tools/errorcode/");

72
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java
View File

@@ -33,10 +33,12 @@ import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.NetworkUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.map.navi.IMogoCarLocationChangedListener2;
import com.mogo.module.common.MogoApisHandler;
import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
import com.mogo.och.common.module.utils.PinYinUtil;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.bean.DriverServiceDataRespBean;
import com.mogo.och.taxi.bean.DriverStatusQueryRespBean;
import com.mogo.och.taxi.bean.OrderGrabRespBean;
@@ -280,15 +282,17 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
queryCarStatus();
// queryCarStatus();
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
queryCarStatus();
ToastUtils.showShort(code + "," + msg);
// queryCarStatus();
}
});
}
@@ -313,15 +317,15 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
TipToast.shortTip("请求出现异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -456,13 +460,13 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
// TipToast.shortTip(code + "," + msg);
// ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -491,15 +495,15 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
TipToast.shortTip("请求出现异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -520,15 +524,15 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
TipToast.shortTip("请求出现异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -553,7 +557,7 @@ public class TaxiModel {
@Override
public void onFail(int code, String msg) {
// TipToast.shortTip(code + "," + msg);
// ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -574,15 +578,15 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
TipToast.shortTip("请求出现异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -668,15 +672,15 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
TipToast.shortTip("请求出现异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -762,15 +766,15 @@ public class TaxiModel {
@Override
public void onError() {
if (!NetworkUtils.isConnected(mContext)) {
TipToast.shortTip("网络异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
}else {
TipToast.shortTip("请求出现异常，请稍后重试");
ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
}
}
@Override
public void onFail(int code, String msg) {
TipToast.shortTip(code + "," + msg);
ToastUtils.showShort(code + "," + msg);
}
});
}
@@ -846,7 +850,7 @@ public class TaxiModel {
public void startAutoPilot(boolean isRestart) {
if (!checkCurrentOCHOrder()) {
CallerLogger.INSTANCE.e(M_TAXI + TAG, "no order or order is empty.");
TipToast.shortTip("当前订单不存在或异常！");
ToastUtils.showShort("当前订单不存在或异常！");
return;
}
@@ -854,7 +858,7 @@ public class TaxiModel {
if (IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE
== CallerAutoPilotStatusListenerManager.INSTANCE.getAutoPilotStatusInfo().getState()) {
// TODO: 2021/11/28 工控机存在刚开始状态为0，但是可以开启变为2，工控机解决前不显示此toast
// TipToast.shortTip("自动驾驶状态为不可用！");
// ToastUtils.showShort("自动驾驶状态为不可用！");
}
double startWgsLon = mCurrentOCHOrder.startSitePoint.get(0);
@@ -876,7 +880,7 @@ public class TaxiModel {
mCurrentOCHOrder.startSiteAddr, mCurrentOCHOrder.endSiteAddr, mCurrentOCHOrder.orderNo);
if (DebugConfig.isDebug()) {
// TipToast.shortTip("Start autopilot!");
// ToastUtils.showShort("Start autopilot!");
}
// TODO: 2021/8/20 无工控机环境， 手动调起自动驾驶开启返回结果,有工控机环境要删除
@@ -906,7 +910,7 @@ public class TaxiModel {
location.getLongitude(), location.getLatitude());
if (DebugConfig.isDebug() && mCurrentOCHOrder.orderStatus == TaxiOrderStatusEnum.OnTheWayToStart.getCode()) {
// TipToast.shortTip("距离上车点：" + Double.valueOf(distance).intValue());
// ToastUtils.showShort("距离上车点：" + Double.valueOf(distance).intValue());
}
CallerLogger.INSTANCE.i(M_TAXI + TAG, "judgeStartStation() distance = " + distance);
@@ -1012,7 +1016,7 @@ public class TaxiModel {
public void setArriveAtStartStation() {
if (mCurrentOCHOrder == null
|| mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.OnTheWayToStart.getCode()) {
TipToast.shortTip("订单状态不匹配该操作！");
ToastUtils.showShort("订单状态不匹配该操作！");
return;
}
updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtStart);
@@ -1021,7 +1025,7 @@ public class TaxiModel {
public void setArriveAtEndStation() {
if (mCurrentOCHOrder == null
|| mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.OnTheWayToEnd.getCode()) {
TipToast.shortTip("订单状态不匹配该操作！");
ToastUtils.showShort("订单状态不匹配该操作！");
return;
}
updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtEnd);
@@ -1034,7 +1038,7 @@ public class TaxiModel {
// if (mADASStatusCallback != null) mADASStatusCallback.onAutopilotRunning();
if (mCurrentOCHOrder == null
|| mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.UserArriveAtStart.getCode()) {
TipToast.shortTip("订单状态不匹配该操作！");
ToastUtils.showShort("订单状态不匹配该操作！");
}
updateOCHOrderStatus(TaxiOrderStatusEnum.OnTheWayToEnd);
}
@@ -1115,7 +1119,7 @@ public class TaxiModel {
return;
}
if (DebugConfig.isDebug()) {
// TipToast.shortTip("到达目的地");
// ToastUtils.showShort("到达目的地");
}
updateOCHOrderStatus(TaxiOrderStatusEnum.ArriveAtEnd);
if (FunctionBuildConfig.isDemoMode) {
@@ -1304,7 +1308,7 @@ public class TaxiModel {
if (mCurrentOCHOrder == null
|| mCurrentOCHOrder.orderStatus != TaxiOrderStatusEnum.ArriveAtStart.getCode()
|| mCurrentOCHOrder.passengerPhone == null || mCurrentOCHOrder.passengerPhone.length() < 5) {
TipToast.shortTip("订单状态不匹配该操作或者手机号有误！");
ToastUtils.showShort("订单状态不匹配该操作或者手机号有误！");
return;
}
TaxiServiceManager.getInstance().checkPhoneAndUpdateOrderStatus(mContext

5
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/BaseTaxiTabFragment.java
View File

@@ -34,6 +34,7 @@ import com.mogo.eagle.core.function.call.devatools.CallerDevaToolsManager;
import com.mogo.eagle.core.function.call.hmi.CallerHmiManager;
import com.mogo.eagle.core.function.call.map.CallerSmpManager;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMapUIController;
import com.mogo.map.MogoMarkerManager;
@@ -179,7 +180,7 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_DISABLE) {
restartAutopilot();
}else {
TipToast.shortTip(getResources().getString(R.string.module_och_taxi_auto_disable_tip));
ToastUtils.showShort(getResources().getString(R.string.module_och_taxi_auto_disable_tip));
}
// TODO: 2021/11/27 通过开启结果更新ui
// onAutopilotStatusChanged(IMoGoAutopilotStatusListener.STATUS_AUTOPILOT_RUNNING);
@@ -239,6 +240,8 @@ public abstract class BaseTaxiTabFragment<V extends IView, P extends Presenter<V
mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_long);
} else if (MogoMapUIController.getInstance().getCurrentMapVisualAngle().isMediumSight()) {
mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
}else {
mSwitchBtnIcon.setImageResource(R.drawable.taxi_switch_map_medium);
}
}

3
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java
View File

@@ -26,6 +26,7 @@ import com.mogo.eagle.core.function.call.map.CallerSmpManager;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.DateTimeUtils;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.eagle.core.utilcode.util.UiThreadHandler;
import com.mogo.map.MogoMarkerManager;
import com.mogo.map.marker.IMogoMarker;
@@ -550,7 +551,7 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement
}
clearSmallMapRouteLine();
//提交取消订单后的回调
TipToast.tip("订单取消成功");
ToastUtils.showShort("订单取消成功");
//更新界面
isHaveBeingOrder(false);
showOrHideNavi(false);

3
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiOrderCancelDialog.java
View File

@@ -22,6 +22,7 @@ import androidx.annotation.RequiresApi;
import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.taxi.constant.TaxiOrderStatusEnum;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.constant.TaxiOrderCancelReasons;
@@ -136,7 +137,7 @@ public class TaxiOrderCancelDialog extends AlertDialog implements View.OnClickLi
}
dismiss();
}else {
TipToast.longTip("取消原因不能为空");
ToastUtils.showShort("取消原因不能为空");
}
}else if (v.getId() == R.id.order_dialog_cancel_tv){//close icon
mCurrentReason = "";

3
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiReserveOrdersFragment.java
View File

@@ -15,6 +15,7 @@ import androidx.recyclerview.widget.LinearLayoutManager;
import androidx.recyclerview.widget.RecyclerView;
import com.mogo.eagle.core.utilcode.mogo.toast.TipToast;
import com.mogo.eagle.core.utilcode.util.ToastUtils;
import com.mogo.och.common.module.utils.DateTimeUtil;
import com.mogo.och.taxi.R;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
@@ -169,7 +170,7 @@ public class TaxiReserveOrdersFragment extends BaseTaxiUIFragment {
}
}
public void onOrderCancelDone(String orderNo){
TipToast.tip("订单取消成功");
ToastUtils.showShort("订单取消成功");
for (int i=0; i< mDatas.size();i++){
OrderQueryRespBean.Result result = mDatas.get(i);
if (orderNo.equals(result.orderNo)){

3
OCH/mogo-och-taxi/src/main/res/values/strings.xml
View File

@@ -27,4 +27,7 @@
<string name="module_och_taxi_order_auto_arrive_end_tip">已到达目的地，感谢乘坐\'蘑菇车联\'无人驾驶车，期待下次相遇</string>
<string name="module_och_taxi_auto_disable_tip">自动驾驶状态为0不可用</string>
<string name="network_error_tip">网络异常，请稍后重试</string>
<string name="request_error_tip">请求出现异常，请稍后重试</string>
</resources>