From 012eaea252245e2c2f33404ae18b6f1890476a8a Mon Sep 17 00:00:00 2001 From: wangmingjun Date: Fri, 20 May 2022 19:12:58 +0800 Subject: [PATCH] =?UTF-8?q?[taxi/bus-d=20270]=201=E3=80=81bus/taxi=20-d=20?= =?UTF-8?q?marker=E8=AE=BE=E7=BD=AE=E8=A7=92=E5=BA=A6=E5=88=A4=E7=A9=BA=20?= =?UTF-8?q?2=E3=80=81taxi/bus=20-d/-p=20=E5=A2=9E=E5=8A=A0=E6=8E=A5?= =?UTF-8?q?=E5=8F=A3=E5=BC=82=E5=B8=B8=E6=8F=90=E7=A4=BA=E5=92=8C=E9=87=8D?= =?UTF-8?q?=E8=AF=95=203=E3=80=81taxi=20-d=20=E6=9B=B4=E6=94=B9=E4=B8=8A?= =?UTF-8?q?=E4=BC=A0=E8=B7=AF=E5=BE=84=E6=8E=A5=E5=8F=A3=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../mogo/och/bus/fragment/BusFragment.java | 11 +- .../com/mogo/och/bus/model/BusLineModel.java | 13 ++- .../com/mogo/och/bus/model/BusOrderModel.java | 12 ++- .../passenger/model/TaxiPassengerModel.java | 2 +- .../com/mogo/och/taxi/model/TaxiModel.java | 102 ++++++++++++++---- .../och/taxi/network/TaxiServiceApiNew.java | 2 +- .../ui/TaxiBeingServerdOrdersFragment.java | 10 +- 7 files changed, 117 insertions(+), 35 deletions(-) diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java index 38633cccd5..0f9e23c4d0 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/fragment/BusFragment.java @@ -11,6 +11,7 @@ import androidx.annotation.NonNull; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; +import com.mogo.eagle.core.data.map.CenterLine; import com.mogo.eagle.core.function.api.autopilot.IMoGoAutopilotStatusListener; import com.mogo.eagle.core.function.call.autopilot.CallerAutoPilotStatusListenerManager; import com.mogo.eagle.core.function.call.map.CallerHDMapManager; @@ -334,10 +335,12 @@ public class BusFragment extends BaseBusTabFragment .latitude(lat) .longitude(longi); IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()) .addMarker(uuid, options); - marker.setRotateAngle(CallerHDMapManager.INSTANCE.getCenterLineInfo( - longi,lat,-1) - .getAngle() - .floatValue()); + CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo( + longi,lat,-1); + if (null != centerLine){ // 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 + marker.setRotateAngle(centerLine.getAngle().floatValue()); + } + }else { CallerLogger.INSTANCE.d(M_BUS + "RemoveMapMaker=",uuid+"=latitude="+lat+",longitude="+longi); MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).removeMarkers(uuid); diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java index e38ed03522..2105bb497e 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusLineModel.java @@ -4,6 +4,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.och.bus.bean.BusQueryLinesResponse; import com.mogo.och.bus.bean.BusRoutesResponse; import com.mogo.och.bus.callback.IBusLinesCallback; @@ -53,7 +54,11 @@ public class BusLineModel { @Override public void onFail(String failMsg) { - + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.longTip("查询所有绑定路线失败:"+failMsg); + } } }); } @@ -69,7 +74,11 @@ public class BusLineModel { @Override public void onFail(String failMsg) { - TipToast.longTip("切换路线失败"); + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.longTip("切换路线失败:"+failMsg); + } } }); } diff --git a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java index e7e11b5703..87da0cd87f 100644 --- a/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java +++ b/OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java @@ -461,6 +461,8 @@ public class BusOrderModel { public void onFail(String failMsg) { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); + }else{ + TipToast.longTip("离站上报失败:"+failMsg); } } }); @@ -548,7 +550,10 @@ public class BusOrderModel { public void onFail(String failMsg) { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.longTip("离站上报失败:"+failMsg); } + } }); } @@ -605,7 +610,7 @@ public class BusOrderModel { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); }else { - TipToast.shortTip(failMsg); + TipToast.shortTip("收车失败："+failMsg); } } }); @@ -632,7 +637,7 @@ public class BusOrderModel { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); }else { - TipToast.shortTip(failMsg); + TipToast.shortTip("出车失败："+failMsg); } } }); @@ -659,8 +664,9 @@ public class BusOrderModel { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); }else { - TipToast.shortTip(failMsg); + TipToast.shortTip("出车收车状态查询："+failMsg); } + queryOperationStatus(); } }); } 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 31618df95a..1cd5563016 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 @@ -653,7 +653,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback @Override public void onFail(int code, String msg) { - + queryOrderRouteList(); } }); } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java index 96739467ae..c18996b9c0 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/TaxiModel.java @@ -285,10 +285,13 @@ public class TaxiModel { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); } + queryCarStatus(); } @Override public void onFail(int code, String msg) { + TipToast.shortTip(code + "," + msg); + queryCarStatus(); } }); } @@ -314,6 +317,8 @@ public class TaxiModel { public void onError() { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); } } @@ -455,12 +460,14 @@ public class TaxiModel { public void onError() { if (!NetworkUtils.isConnected(mContext)) { TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); } } @Override public void onFail(int code, String msg) { -// TipToast.shortTip(code + "," + msg); + TipToast.shortTip(code + "," + msg); } }); } @@ -486,9 +493,18 @@ public class TaxiModel { } } + @Override + public void onError() { + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); + } + } + @Override public void onFail(int code, String msg) { -// TipToast.shortTip(code + "," + msg); + TipToast.shortTip(code + "," + msg); } }); } @@ -506,9 +522,18 @@ public class TaxiModel { } } + @Override + public void onError() { + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); + } + } + @Override public void onFail(int code, String msg) { -// TipToast.shortTip(code + "," + msg); + TipToast.shortTip(code + "," + msg); } }); } @@ -551,9 +576,18 @@ public class TaxiModel { } } + @Override + public void onError() { + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); + } + } + @Override public void onFail(int code, String msg) { - TipToast.shortTip("请求异常，请稍后重试"); + TipToast.shortTip(code + "," + msg); } }); } @@ -635,9 +669,18 @@ public class TaxiModel { } } + @Override + public void onError() { + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); + } + } + @Override public void onFail(int code, String msg) { - TipToast.shortTip("请求异常，请稍后重试"); + TipToast.shortTip(code + "," + msg); } }); } @@ -721,8 +764,17 @@ public class TaxiModel { } @Override - public void onFail(int code, String msg) { + public void onError() { + if (!NetworkUtils.isConnected(mContext)) { + TipToast.shortTip("网络异常，请稍后重试"); + }else { + TipToast.shortTip("请求出现异常，请稍后重试"); + } + } + @Override + public void onFail(int code, String msg) { + TipToast.shortTip(code + "," + msg); } }); } @@ -1094,6 +1146,11 @@ public class TaxiModel { } + @Override + public void onError() { + // TODO: 2022/5/18 是否在请求异常时候进行提示 + } + @Override public void onFail(int code, String msg) { @@ -1171,22 +1228,27 @@ public class TaxiModel { * 查询当前订单的全局路径 （当自动驾驶开启后，订单前往乘客上车点，杀掉应用再次进来时候） */ private void queryOrderRouteList(String orderNo) { - if (mCurrentOCHOrder != null){ - TaxiServiceManager.getInstance().queryOrderRoute(mContext, orderNo, - new TaxiServiceCallback() { - @Override - public void onSuccess(QueryOrderRouteResp data) { - if (data != null && data.data != null){ - mRoutePoints.clear(); - mRoutePoints.addAll(data.data); - } - } + if (mCurrentOCHOrder != null) { + TaxiServiceManager.getInstance().queryOrderRoute(mContext, orderNo, + new TaxiServiceCallback() { + @Override + public void onSuccess(QueryOrderRouteResp data) { + if (data != null && data.data != null) { + mRoutePoints.clear(); + mRoutePoints.addAll(data.data); + } + } - @Override - public void onFail(int code, String msg) { + @Override + public void onError() { + // TODO: 2022/5/18 是否在请求异常的时候提示 + } - } - }); + @Override + public void onFail(int code, String msg) { + + } + }); } } diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java index b5a3f83639..b504478a2e 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java @@ -186,7 +186,7 @@ interface TaxiServiceApiNew { * @return */ @Headers( {"Content-type:application/json;charset=UTF-8"} ) - @POST("/autopilot-car-hailing/order/v2/driver/taxi/orderRoute") + @POST("/autopilot-car-hailing/order/v2/driver/taxi/saveOrderRoute") // @POST("/mock/268/autopilot-car-hailing/order/v2/driver/taxi/orderRoute") Observable updateOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Body OrderRouteUpdateReqBean data); diff --git a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java index a32d01c771..14cb6b72e7 100644 --- a/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java +++ b/OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/ui/TaxiBeingServerdOrdersFragment.java @@ -20,6 +20,7 @@ import com.amap.api.navi.model.NaviLatLng; import com.mogo.commons.AbsMogoApplication; import com.mogo.commons.debug.DebugConfig; import com.mogo.commons.voice.AIAssist; +import com.mogo.eagle.core.data.map.CenterLine; 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; @@ -623,10 +624,11 @@ public class TaxiBeingServerdOrdersFragment extends BaseTaxiUIFragment implement .latitude(station.get(1)) .longitude(station.get(0)); IMogoMarker marker = MogoMarkerManager.getInstance(AbsMogoApplication.getApp()).addMarker(uuid, options); - marker.setRotateAngle(CallerHDMapManager.INSTANCE.getCenterLineInfo( - station.get(0),station.get(1),-1) - .getAngle() - .floatValue()); + CenterLine centerLine = CallerHDMapManager.INSTANCE.getCenterLineInfo(station.get(0) + ,station.get(1),-1); + if (null != centerLine){// 有可能鹰眼map为空没有角度。判空使用后可能造成maker角度跟道路角度不一致 + marker.setRotateAngle(centerLine.getAngle().floatValue()); + } }else { CallerLogger.INSTANCE.d(M_TAXI + "RemoveMapMaker=",uuid+"=latitude="+station.get(1)+",longitude="+station.get(0));