[2.13.0] bus接口请求错误重试

# Conflicts: # OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java # OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/model/BusOrderModel.java
2022-12-12 11:14:30 +08:00
parent faf313940c
commit 990cff2390
3 changed files with 136 additions and 22 deletions
--- a/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
+++ b/OCH/mogo-och-bus-passenger/src/main/java/com/mogo/och/bus/passenger/model/BusPassengerModel.java
@@ -32,6 +32,8 @@ import com.mogo.eagle.core.utilcode.mogo.AppIdentityModeUtils;
 import com.mogo.eagle.core.utilcode.mogo.logger.CallerLogger;
 import com.mogo.eagle.core.utilcode.mogo.storage.SharedPrefsMgr;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
+import com.mogo.eagle.core.utilcode.util.ToastUtils;
+import com.mogo.och.bus.passenger.R;
 import com.mogo.och.bus.passenger.bean.BusPassengerOperationStatusResponse;
 import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResponse;
 import com.mogo.och.bus.passenger.bean.BusPassengerRoutesResult;
@@ -46,7 +48,7 @@ import com.mogo.och.bus.passenger.network.BusPassengerModelLoopManager;
 import com.mogo.och.bus.passenger.network.BusPassengerServiceManager;
 import com.mogo.och.common.module.biz.network.OchCommonServiceCallback;
 import com.mogo.och.common.module.utils.CoordinateCalculateRouteUtil;
-
+import com.mogo.och.common.module.utils.ToastUtilsOch;
 import org.jetbrains.annotations.NotNull;

 import java.util.ArrayList;
@@ -134,21 +136,31 @@ public class BusPassengerModel {
    private void queryDriverOperationStatus() {
        BusPassengerServiceManager.queryDriverOperationStatus(mContext
                , new OchCommonServiceCallback<BusPassengerOperationStatusResponse>() {
-            @Override
-            public void onSuccess(BusPassengerOperationStatusResponse data) {
-                if (data == null || data.data == null) return;
-                if(mDriverStatusCallback != null){
-                    mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1);
-                    mDriverStatusCallback.updatePlateNumber(data.data.plateNumber);
-                }
-            }
+                    @Override
+                    public void onSuccess(BusPassengerOperationStatusResponse data) {
+                        if (data == null || data.data == null) return;
+                        if (mDriverStatusCallback != null) {
+                            mDriverStatusCallback.changeOperationStatus(data.data.driverStatus == 1);
+                            mDriverStatusCallback.updatePlateNumber(data.data.plateNumber);
+                        }
+                    }

-            @Override
-            public void onFail(int code, String msg) {
-                //延迟3s再次查询
-                queryDriverOperationDelay();
-            }
-        });
+                    @Override
+                    public void onError() {
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                        } else {
+                            ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                        }
+                        queryDriverOperationDelay();
+                    }
+
+                    @Override
+                    public void onFail(int code, String msg) {
+                        //延迟3s再次查询
+                        queryDriverOperationDelay();
+                    }
+                });
    }

    public void queryDriverSiteByCoordinate(){
@@ -174,13 +186,30 @@ public class BusPassengerModel {
                        updatePassengerRouteInfo(data.getResult());
                    }

+                    @Override
+                    public void onError() {
+                        if (ToastUtilsOch.isCustomFastClick(5000)){
+                            if (!NetworkUtils.isConnected(mContext)) {
+                                ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                            } else {
+                                ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                            }
+                            queryDriverSiteByCoordinate();
+                        }
+                    }
+
                    @Override
                    public void onFail(int code, String msg) {
-                         //code = 1003; message = bus车辆已收车或未出车;bus driver shadow,not exists
                        if (code == 1003){
                            routesResult = null;
                            startOrStopCalculateRouteInfo(false);
                            queryDriverOperationDelay();
+                            return;
+                        }
+                        if (ToastUtilsOch.isCustomFastClick(10000)){
+                            //code = 1003; message = bus车辆已收车或未出车;bus driver shadow,not exists
+                            ToastUtils.showShort(msg);
+                            queryDriverSiteByCoordinate();
                        }
                    }
                });
--- 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
@@ -6,6 +6,7 @@ import com.mogo.commons.AbsMogoApplication;
 import com.mogo.eagle.core.utilcode.util.NetworkUtils;
 import com.mogo.eagle.core.utilcode.util.SharedPrefs;
 import com.mogo.eagle.core.utilcode.util.ToastUtils;
+import com.mogo.och.bus.R;
 import com.mogo.och.bus.bean.BusQueryLineTaskResponse;
 import com.mogo.och.bus.bean.BusQueryLinesResponse;
 import com.mogo.och.bus.bean.BusRoutesResponse;
@@ -56,6 +57,15 @@ public class BusLineModel {
                }
            }

+            @Override
+            public void onError() {
+                if (!NetworkUtils.isConnected(mContext)) {
+                    ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                } else {
+                    ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                }
+            }
+
            @Override
            public void onFail(int code, String failMsg) {
                if (!NetworkUtils.isConnected(mContext)) {
@@ -86,6 +96,15 @@ public class BusLineModel {
                }
            }

+            @Override
+            public void onError() {
+                if (!NetworkUtils.isConnected(mContext)) {
+                    ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                } else {
+                    ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                }
+            }
+
            @Override
            public void onFail(int code, String failMsg) {
                if (!NetworkUtils.isConnected(mContext)) {
@@ -107,6 +126,15 @@ public class BusLineModel {
                }
            }

+            @Override
+            public void onError() {
+                if (!NetworkUtils.isConnected(mContext)) {
+                    ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                } else {
+                    ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                }
+            }
+
            @Override
            public void onFail(int code, String failMsg) {
                if (!NetworkUtils.isConnected(mContext)) {
--- 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
@@ -120,7 +120,7 @@ public class BusOrderModel {
    private volatile int firstStartAutopilot = 0;

    private LoginService loginService;
-    
+
    private final Handler handler = new Handler(new Handler.Callback() {
        @Override
        public boolean handleMessage(Message msg) {
@@ -448,11 +448,23 @@ public class BusOrderModel {
                updateBusStatus(data.getResult());
            }

+
+            @Override
+            public void onError() {
+                if (!NetworkUtils.isConnected(mContext)) {
+                    ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                } else {
+                    ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                }
+            }
+
            @Override
            public void onFail(int code, String failMsg) {
-                // 重复请求小巴路线，直至成功
-                //改为任务，为空不再去一直取
-//                queryBusStationDelay();
+                if (!NetworkUtils.isConnected(mContext)) {
+                    ToastUtils.showShort("网络异常，请稍后重试");
+                }else {
+                    ToastUtils.showShort(failMsg);
+                }
            }
        });

@@ -530,9 +542,22 @@ public class BusOrderModel {
                        }
                    }

+                    @Override
+                    public void onError() {
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                        } else {
+                            ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                        }
+                    }
+
                    @Override
                    public void onFail(int code, String failMsg) {
-                        ToastUtils.showShort(failMsg);
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort("网络异常，请稍后重试");
+                        }else {
+                            ToastUtils.showShort(failMsg);
+                        }
                    }
                });

@@ -657,6 +682,15 @@ public class BusOrderModel {
 //                        startOrStopQueryPassengerWriteOff(true);
                    }

+                    @Override
+                    public void onError() {
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                        } else {
+                            ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                        }
+                    }
+
                    @Override
                    public void onFail(int code, String failMsg) {
                        if (ToastUtilsOch.isCustomFastClick(5000)) {
@@ -716,6 +750,16 @@ public class BusOrderModel {
                        leaveStationSuccess(backgroundCurrentStationIndex, currentStationName, finalNextStationName);
                    }

+
+                    @Override
+                    public void onError() {
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                        } else {
+                            ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                        }
+                    }
+
                    @Override
                    public void onFail(int code, String failMsg) {
                        if (!NetworkUtils.isConnected(mContext)) {
@@ -979,9 +1023,22 @@ public class BusOrderModel {
                        }
                    }

+                    @Override
+                    public void onError() {
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort(mContext.getString(R.string.network_error_tip));
+                        } else {
+                            ToastUtils.showShort(mContext.getString(R.string.request_error_tip));
+                        }
+                    }
+
                    @Override
                    public void onFail(int code, String failMsg) {
-                        ToastUtils.showShort(failMsg);
+                        if (!NetworkUtils.isConnected(mContext)) {
+                            ToastUtils.showShort("网络异常，请稍后重试");
+                        }else {
+                            ToastUtils.showShort(failMsg);
+                        }
                    }
                });
    }