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

[taxi/bus-d 270] 1、bus/taxi -d marker设置角度判空 2、taxi/bus -d/-p 增加接口异常提示和重试 3、taxi -d 更改上传路径接口名

Browse Source
This commit is contained in:
wangmingjun
2022-05-20 19:12:58 +08:00
parent 491b1b96a6
commit 012eaea252
7 changed files with 117 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -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<BusFragment, BusPresenter>
.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);

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

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

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

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

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

@@ -653,7 +653,7 @@ public class TaxiPassengerModel implements IOCHTaxiPassengerNaviChangedCallback
@Override
public void onFail(int code, String msg) {
queryOrderRouteList();
}
});
}

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

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

2
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/TaxiServiceApiNew.java
View File

@@ -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<BaseData> updateOrderRoute(@Header ("appId") String appId, @Header("ticket") String ticket, @Body OrderRouteUpdateReqBean data);

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

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