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

[Taxi Passenger v1.1.0] taxi/bus-d taxi-p 部分接口整理

Browse Source
This commit is contained in:
wangmingjun
2022-03-08 15:17:21 +08:00
parent b79ee44239
commit 608b62ba6c
10 changed files with 301 additions and 181 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
OCH/mogo-och-bus/src/main/java/com/mogo/och/bus/net/IOchBusApiService.java
View File

@@ -35,7 +35,8 @@ public interface IOchBusApiService {
* @return 接口返回数据
*/
@Headers( {"Content-Type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/line/v2/lineDataWithDriver/query" )
// @POST( "/autopilot-car-hailing/line/v2/lineDataWithDriver/query" )
@POST( "/autopilot-car-hailing/line/v2/driver/bus/lineDataWithDriver/query" )
// @POST( "/mock/268/autopilot-car-hailing/bus/api/lineDataWithDriver/query" )
Observable< OchBusRoutesResponse > querySiteByCoordinate(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusQueryLineStationsRequest request);
@@ -46,7 +47,8 @@ public interface IOchBusApiService {
* @return 返回值是重置后的车站列表
*/
@Headers( {"Content-Type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/car/v2/bus/drivingLine/reset" )
// @POST( "/autopilot-car-hailing/car/v2/bus/drivingLine/reset" )
@POST( "/autopilot-car-hailing/car/v2/driver/bus/drivingLine/reset" )
// @POST( "/mock/268/autopilot-car-hailing/bus/api/drivingLine/reset" )
Observable< OchBusRoutesResponse > resetStationStatus(@Header ("appId") String appId, @Header("ticket") String ticket, @Body OchBusResetDrivingLineRequest request);
@@ -56,7 +58,8 @@ public interface IOchBusApiService {
* @return
*/
@Headers({"Content-Type:application/json;charset=UTF-8"})
@POST("/autopilot-car-hailing/car/v2/bus/driving/away")
// @POST("/autopilot-car-hailing/car/v2/bus/driving/away")
@POST("/autopilot-car-hailing/car/v2/driver/bus/driving/away")
// @POST("/mock/268/autopilot-car-hailing/bus/api/driving/away")
Observable< OchBusRoutesResponse > leaveStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusUpdateSiteStatusRequest request);
@@ -66,7 +69,8 @@ public interface IOchBusApiService {
* @return
*/
@Headers({"Content-type:application/json;charset=UTF-8"})
@POST("/autopilot-car-hailing/order/v2/bus/driving/attachSite")
// @POST("/autopilot-car-hailing/order/v2/bus/driving/attachSite")
@POST("/autopilot-car-hailing/order/v2/driver/bus/driving/attachSite")
// @POST("/mock/268/autopilot-car-hailing/bus/api/driving/attachSite")
Observable< BaseData > arriveSiteStation(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusUpdateSiteStatusRequest request);
@@ -87,7 +91,8 @@ public interface IOchBusApiService {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST("/autopilot-car-hailing/car/v2/bus/startTakeOrder")
// @POST("/autopilot-car-hailing/car/v2/bus/startTakeOrder")
@POST("/autopilot-car-hailing/car/v2/driver/bus/startTakeOrder")
// @POST("/mock/268/autopilot-car-hailing/bus/api/startTakeOrder")
Observable<BaseData> startTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusOperationStatusRequest request);
@@ -97,7 +102,8 @@ public interface IOchBusApiService {
* @return
*/
@Headers({"Content-type:application/json;charset=UTF-8"})
@POST("/autopilot-car-hailing/car/v2/bus/stopTakeOrder")
// @POST("/autopilot-car-hailing/car/v2/bus/stopTakeOrder")
@POST("/autopilot-car-hailing/car/v2/driver/bus/stopTakeOrder")
// @POST("/mock/268/autopilot-car-hailing/bus/api/stopTakeOrder")
Observable<BaseData> stopTakeOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OchBusOperationStatusRequest request);
@@ -107,7 +113,8 @@ public interface IOchBusApiService {
* @return
*/
@Headers({"Content-type:application/json;charset=UTF-8"})
@GET("/autopilot-car-hailing/car/v2/bus/takeOrderStatus/query")
// @GET("/autopilot-car-hailing/car/v2/bus/takeOrderStatus/query")
@GET("/autopilot-car-hailing/car/v2/driver/bus/takeOrderStatus/query")
// @GET("/mock/268/autopilot-car-hailing/bus/api/takeOrderStatus/query")
Observable<OchBusOperationStatusResponse> queryOperationStatus(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn);
@@ -122,7 +129,8 @@ public interface IOchBusApiService {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/location/v2/driver/heartbeat" )
// @POST( "/autopilot-car-hailing/location/v2/driver/heartbeat" )
@POST( "/autopilot-car-hailing/location/v2/driver/bus/heartbeat" )
Observable<BaseData> runCarHeartbeat(@Header ("appId") String appId,@Header("ticket") String ticket,@Body CarHeartbeatReqBean data);
/**
@@ -132,7 +140,8 @@ public interface IOchBusApiService {
* @param sn
* @return
*/
@GET("/autopilot-car-hailing/line/v2/driver/bindLine/query")
// @GET("/autopilot-car-hailing/line/v2/driver/bindLine/query")
@GET("/autopilot-car-hailing/line/v2/driver/bus/bindLine/query")
Observable<BusQueryLinesResponse> queryBusLines(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
}

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

@@ -10,7 +10,6 @@ import androidx.annotation.Nullable;
import com.elegant.network.utils.GsonUtil;
import com.mogo.cloud.commons.utils.CoordinateUtils;
import com.mogo.commons.debug.DebugConfig;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.data.autopilot.ADASTrajectoryInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotGuardianStatusInfo;
import com.mogo.eagle.core.data.autopilot.AutopilotRouteInfo;
@@ -37,7 +36,7 @@ import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback
import com.mogo.och.taxi.passenger.constant.TaxiPassengerConst;
import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum;
import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceCallback;
import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManagerNew;
import com.mogo.och.taxi.passenger.network.TaxiPassengerServiceManager;
import com.mogo.service.IMogoServiceApis;
import com.mogo.service.cloud.socket.IMogoLifecycleListener;
import com.mogo.service.intent.IMogoIntentListener;
@@ -55,15 +54,15 @@ import java.util.List;
*
* 网约车 - 出租车业务逻辑处理
*/
public class TaxiPassengerModelNew {
public class TaxiPassengerModel {
private static final String TAG = TaxiPassengerModelNew.class.getSimpleName();
private static final String TAG = TaxiPassengerModel.class.getSimpleName();
private static final class SingletonHolder {
private static final TaxiPassengerModelNew INSTANCE = new TaxiPassengerModelNew();
private static final TaxiPassengerModel INSTANCE = new TaxiPassengerModel();
}
public static TaxiPassengerModelNew getInstance() {
public static TaxiPassengerModel getInstance() {
return SingletonHolder.INSTANCE;
}
@@ -83,7 +82,7 @@ public class TaxiPassengerModelNew {
private double mLongitude, mLatitude;
private TaxiPassengerModelNew() {
private TaxiPassengerModel() {
}
public void setMoGoAutopilotPlanningListener(IOCHTaxiPassengerAutopilotPlanningCallback
moGoAutopilotPlanningCallback) {
@@ -111,11 +110,14 @@ public class TaxiPassengerModelNew {
if (DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_SELF_INNOVATE) {
apis.getLocationInfoApi().start();
}
if (NetworkUtils.isConnected(mContext)) {
startOrStopOrderLoop(mOCHCarStatus == 1);
}
}
public void startOrStopOrderLoop(){
startOrStopOrderLoop(mOCHCarStatus == 1);
}
// public void startOrStopOrderLoop(){
// startOrStopOrderLoop(mOCHCarStatus == 1);
// }
public void release() {
startOrStopOrderLoop(false);
@@ -173,10 +175,10 @@ public class TaxiPassengerModelNew {
Logger.d(TAG, "startOrStopOrderLoop() " + start);
if (start) {
TaxiPassengerModelLoopManager.getInstance().startInAndWaitOrdersLoop();
TaxiPassengerModelLoopManager.getInstance().startHeartbeatLoop();
// TaxiPassengerModelLoopManager.getInstance().startHeartbeatLoop();
} else {
TaxiPassengerModelLoopManager.getInstance().stopInAndWaitOrdersLoop();
TaxiPassengerModelLoopManager.getInstance().stopHeartbeatLoop();
// TaxiPassengerModelLoopManager.getInstance().stopHeartbeatLoop();
}
}
@@ -187,7 +189,7 @@ public class TaxiPassengerModelNew {
* 才更新最新进行中单到本地
*/
public void queryInAndWaitOrders() {
TaxiPassengerServiceManagerNew.getInstance().queryOrdersInAndWaitService(mContext,
TaxiPassengerServiceManager.getInstance().queryOrdersInAndWaitService(mContext,
new TaxiPassengerServiceCallback<TaxiPassengerOrdersInServiceQueryRespBean>() {
@Override
public void onSuccess(TaxiPassengerOrdersInServiceQueryRespBean data) {
@@ -239,7 +241,7 @@ public class TaxiPassengerModelNew {
return;
}
final long orderId = mCurrentOCHOrder.orderNo;
TaxiPassengerServiceManagerNew.getInstance().queryOrderById(mContext, orderId,
TaxiPassengerServiceManager.getInstance().queryOrderById(mContext, orderId,
new TaxiPassengerServiceCallback<TaxiPassengerOrderQueryRespBean>() {
@Override
public void onSuccess(TaxiPassengerOrderQueryRespBean data) {
@@ -266,20 +268,20 @@ public class TaxiPassengerModelNew {
}
// 车机端上传心跳数据（只在出车状态时上传）
public void runCarHeartbeat() {
TaxiPassengerServiceManagerNew.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude,
new TaxiPassengerServiceCallback<BaseData>() {
@Override
public void onSuccess(BaseData data) {
}
@Override
public void onFail(int code, String msg) {
}
});
}
// public void runCarHeartbeat() {
// TaxiPassengerServiceManager.getInstance().runCarHeartbeat(mContext, mLongitude, mLatitude,
// new TaxiPassengerServiceCallback<BaseData>() {
// @Override
// public void onSuccess(BaseData data) {
//
// }
//
// @Override
// public void onFail(int code, String msg) {
//
// }
// });
// }
// 获取当前订单
public TaxiPassengerOrderQueryRespBean.Result getCurrentOCHOrder() {
@@ -288,7 +290,7 @@ public class TaxiPassengerModelNew {
// 获取当前订单状态
public TaxiPassengerOrderStatusEnum getCurOrderStatus() {
TaxiPassengerOrderQueryRespBean.Result order = TaxiPassengerModelNew.getInstance().getCurrentOCHOrder();
TaxiPassengerOrderQueryRespBean.Result order = TaxiPassengerModel.getInstance().getCurrentOCHOrder();
if (order == null) {
return TaxiPassengerOrderStatusEnum.None;
}

40
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/model/TaxiPassengerModelLoopManager.java
View File

@@ -40,7 +40,7 @@ public class TaxiPassengerModelLoopManager {
.map((aLong -> aLong + 1))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> TaxiPassengerModelNew.getInstance().queryInAndWaitOrders());
.subscribe(aLong -> TaxiPassengerModel.getInstance().queryInAndWaitOrders());
}
public void stopInAndWaitOrdersLoop() {
@@ -52,24 +52,24 @@ public class TaxiPassengerModelLoopManager {
}
public void startHeartbeatLoop() {
if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) {
return;
}
Logger.i(TAG, "startHeartbeatLoop()");
mHeartbeatDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY,
TaxiPassengerConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS)
.map((aLong -> aLong + 1))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(aLong -> TaxiPassengerModelNew.getInstance().runCarHeartbeat());
}
// public void startHeartbeatLoop() {
// if (mHeartbeatDisposable != null && !mHeartbeatDisposable.isDisposed()) {
// return;
// }
// Logger.i(TAG, "startHeartbeatLoop()");
// mHeartbeatDisposable = Observable.interval(TaxiPassengerConst.LOOP_DELAY,
// TaxiPassengerConst.LOOP_PERIOD_60S, TimeUnit.MILLISECONDS)
// .map((aLong -> aLong + 1))
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(aLong -> TaxiPassengerModel.getInstance().runCarHeartbeat());
// }
public void stopHeartbeatLoop() {
if (mHeartbeatDisposable != null) {
Logger.i(TAG, "stopHeartbeatLoop()");
mHeartbeatDisposable.dispose();
mHeartbeatDisposable = null;
}
}
// public void stopHeartbeatLoop() {
// if (mHeartbeatDisposable != null) {
// Logger.i(TAG, "stopHeartbeatLoop()");
// mHeartbeatDisposable.dispose();
// mHeartbeatDisposable = null;
// }
// }
}

28
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApiNew.java → OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.java
View File

@@ -8,6 +8,7 @@ import com.mogo.och.taxi.passenger.bean.TaxiPassengerOrdersInServiceQueryRespBea
import io.reactivex.Observable;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.Header;
import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.Query;
@@ -17,7 +18,7 @@ import retrofit2.http.Query;
*
* 网约车-出租车接口定义
*/
interface TaxiPassengerServiceApiNew {
interface TaxiPassengerServiceApi {
/**
* 查询全部服务中/待服务订单（没有的时候返回code 0，空列表）
@@ -25,8 +26,8 @@ interface TaxiPassengerServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET("/autopilot-car-hailing/api/v1/driver/orderInService/query")
Observable<TaxiPassengerOrdersInServiceQueryRespBean> queryOrdersInAndWaitService(@Query("sn") String sn);
@GET("/autopilot-car-hailing/order/v2/driver/taxi/orderInService/query")
Observable<TaxiPassengerOrdersInServiceQueryRespBean> queryOrdersInAndWaitService(@Header("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
/**
@@ -36,26 +37,15 @@ interface TaxiPassengerServiceApiNew {
* @deprecated v2.1_0930需求中暂不再使用此接口
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/queryOrderById" )
Observable<TaxiPassengerOrderQueryRespBean> queryOrderById(@Body TaxiPassengerOrderQueryReqBean data);
/**
* 查询服务中订单信息（用于本地无orderId时）
* 如果有多条，只会返回时间最近的一条
* @param sn
* @return
* @deprecated v2.1_0930需求中暂不再使用此接口
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET( "/autopilot-car-hailing/api/v1/driver/queryOrderInService" )
Observable<TaxiPassengerOrderQueryRespBean> queryOrderInService(@Query("sn") String sn);
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/queryOrderById" )
Observable<TaxiPassengerOrderQueryRespBean> queryOrderById(@Header ("appId") String appId,@Header("ticket") String ticket,@Body TaxiPassengerOrderQueryReqBean data);
/**
* 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度
* @param data
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/heartbeat" )
Observable<BaseData> runCarHeartbeat(@Body TaxiPassengerCarHeartbeatReqBean data);
// @Headers( {"Content-type:application/json;charset=UTF-8"} )
// @POST( "/autopilot-car-hailing/api/v1/driver/heartbeat" )
// Observable<BaseData> runCarHeartbeat(@Body TaxiPassengerCarHeartbeatReqBean data);
}

86
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManagerNew.java → OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.java
View File

@@ -4,6 +4,7 @@ import android.content.Context;
import com.mogo.cloud.passport.MoGoAiCloudClientConfig;
import com.mogo.eagle.core.data.BaseData;
import com.mogo.eagle.core.function.call.telematic.CallerTelematicManager;
import com.mogo.eagle.core.network.RequestOptions;
import com.mogo.eagle.core.network.SubscribeImpl;
import com.mogo.eagle.core.utilcode.mogo.logger.Logger;
@@ -20,24 +21,24 @@ import io.reactivex.schedulers.Schedulers;
/**
* Created by pangfan on 2021/8/19
*/
public class TaxiPassengerServiceManagerNew {
private static final String TAG = TaxiPassengerServiceManagerNew.class.getSimpleName();
public class TaxiPassengerServiceManager {
private static final String TAG = TaxiPassengerServiceManager.class.getSimpleName();
private static final class SingletonHolder {
private static final TaxiPassengerServiceManagerNew INSTANCE = new TaxiPassengerServiceManagerNew();
private static final TaxiPassengerServiceManager INSTANCE = new TaxiPassengerServiceManager();
}
public static TaxiPassengerServiceManagerNew getInstance() {
public static TaxiPassengerServiceManager getInstance() {
return SingletonHolder.INSTANCE;
}
private String baseUrl = TaxiPassengerConst.getBaseUrl();
private TaxiPassengerServiceApiNew mOCHTaxiServiceApi;
private TaxiPassengerServiceApi mOCHTaxiServiceApi;
private TaxiPassengerServiceManagerNew() {
private TaxiPassengerServiceManager() {
if (mOCHTaxiServiceApi == null){
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(TaxiPassengerServiceApiNew.class, baseUrl);
.create(TaxiPassengerServiceApi.class, baseUrl);
}
}
@@ -50,9 +51,11 @@ public class TaxiPassengerServiceManagerNew {
TaxiPassengerServiceCallback<TaxiPassengerOrdersInServiceQueryRespBean> callback) {
if (mOCHTaxiServiceApi == null) {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(TaxiPassengerServiceApiNew.class, baseUrl);
.create(TaxiPassengerServiceApi.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getSn())
mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,CallerTelematicManager.INSTANCE.getServerToken()) //获取到司机端的sn
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryOrdersInAndWaitService"));
@@ -69,53 +72,36 @@ public class TaxiPassengerServiceManagerNew {
TaxiPassengerServiceCallback<TaxiPassengerOrderQueryRespBean> callback) {
if ( mOCHTaxiServiceApi == null ) {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(TaxiPassengerServiceApiNew.class, baseUrl);
.create(TaxiPassengerServiceApi.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrderById(new TaxiPassengerOrderQueryReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId))
mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new TaxiPassengerOrderQueryReqBean(
CallerTelematicManager.INSTANCE.getServerToken(), orderId)) //获取到司机端的sn
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryOrderById"));
}
/**
* 查询未完成态订单信息（用于本地无orderId时）
* 如果有多条，只会返回时间最近的一条
* @param context
* @param callback
* @deprecated v2.1_0930需求中暂不再使用此接口
*/
public void queryOrderInService(Context context,
TaxiPassengerServiceCallback<TaxiPassengerOrderQueryRespBean> callback) {
if ( mOCHTaxiServiceApi == null ) {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(TaxiPassengerServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrderInService(MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryOrderInService"));
}
/**
* 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度
* @param context
* @param lon
* @param lat
* @param callback
*/
public void runCarHeartbeat(Context context, double lon, double lat,
TaxiPassengerServiceCallback<BaseData> callback) {
if ( mOCHTaxiServiceApi == null ) {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(TaxiPassengerServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.runCarHeartbeat(new TaxiPassengerCarHeartbeatReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "runCarHeartbeat"));
}
// /**
// * 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度
// * @param context
// * @param lon
// * @param lat
// * @param callback
// */
// public void runCarHeartbeat(Context context, double lon, double lat,
// TaxiPassengerServiceCallback<BaseData> callback) {
// if ( mOCHTaxiServiceApi == null ) {
// mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
// .create(TaxiPassengerServiceApi.class, baseUrl);
// }
// mOCHTaxiServiceApi.runCarHeartbeat(new TaxiPassengerCarHeartbeatReqBean(
// MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat))
// .subscribeOn(Schedulers.io())
// .observeOn(AndroidSchedulers.mainThread())
// .subscribe(getSubscribeImpl(context, callback, "runCarHeartbeat"));
// }
private <T extends BaseData> SubscribeImpl getSubscribeImpl(
Context context, TaxiPassengerServiceCallback<T> callback, String apiName) {

24
OCH/mogo-och-taxi-passenger/src/main/java/com/mogo/och/taxi/passenger/presenter/BaseTaxiPassengerPresenter.java
View File

@@ -19,7 +19,7 @@ import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerAutopilotPlanningCa
import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerControllerStatusCallback;
import com.mogo.och.taxi.passenger.callback.IOCHTaxiPassengerOrderStatusCallback;
import com.mogo.och.taxi.passenger.constant.TaxiPassengerOrderStatusEnum;
import com.mogo.och.taxi.passenger.model.TaxiPassengerModelNew;
import com.mogo.och.taxi.passenger.model.TaxiPassengerModel;
import com.mogo.och.taxi.passenger.ui.TaxiPassengerBaseFragment;
import java.util.List;
@@ -34,7 +34,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
public BaseTaxiPassengerPresenter(TaxiPassengerBaseFragment view) {
super(view);
TaxiPassengerModelNew.getInstance().init(AbsMogoApplication.getApp());
TaxiPassengerModel.getInstance().init(AbsMogoApplication.getApp());
initListeners();
}
@@ -49,21 +49,21 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
super.onDestroy( owner );
releaseListeners();
TaxiPassengerModelNew.getInstance().release();
TaxiPassengerModel.getInstance().release();
}
private void initListeners() {
TaxiPassengerModelNew.getInstance().setADASStatusCallback(this);
TaxiPassengerModelNew.getInstance().setMoGoAutopilotPlanningListener(this);
TaxiPassengerModelNew.getInstance().setOrderStatusCallback(this);
TaxiPassengerModelNew.getInstance().setControllerStatusCallback(this);
TaxiPassengerModel.getInstance().setADASStatusCallback(this);
TaxiPassengerModel.getInstance().setMoGoAutopilotPlanningListener(this);
TaxiPassengerModel.getInstance().setOrderStatusCallback(this);
TaxiPassengerModel.getInstance().setControllerStatusCallback(this);
}
private void releaseListeners() {
TaxiPassengerModelNew.getInstance().setADASStatusCallback(null);
TaxiPassengerModelNew.getInstance().setMoGoAutopilotPlanningListener(null);
TaxiPassengerModelNew.getInstance().setOrderStatusCallback(null);
TaxiPassengerModelNew.getInstance().setControllerStatusCallback(null);
TaxiPassengerModel.getInstance().setADASStatusCallback(null);
TaxiPassengerModel.getInstance().setMoGoAutopilotPlanningListener(null);
TaxiPassengerModel.getInstance().setOrderStatusCallback(null);
TaxiPassengerModel.getInstance().setControllerStatusCallback(null);
}
private void runOnUIThread( Runnable executor ) {
@@ -79,7 +79,7 @@ public class BaseTaxiPassengerPresenter extends Presenter<TaxiPassengerBaseFragm
// 获取当前订单状态
public TaxiPassengerOrderStatusEnum getCurOrderStatus() {
return TaxiPassengerModelNew.getInstance().getCurOrderStatus();
return TaxiPassengerModel.getInstance().getCurOrderStatus();
}
@Override

23
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/bean/OrderRouteUpdateReqBean.java Normal file
View File

@@ -0,0 +1,23 @@
package com.mogo.och.taxi.bean;
import java.util.List;
/**
* Created by pangfan on 2021/8/19
*
* 订单状态更新请求数据结构
*/
public class OrderRouteUpdateReqBean {
public long orderNo;
public List<Result> points;
public static class Result {
public Double lat;
public Double lon;
}
public OrderRouteUpdateReqBean(long orderNo, List<Result> points) {
this.orderNo = orderNo;
this.points = points;
}
}

31
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/model/MogoOCHTaxiModelNew.java
View File

@@ -37,6 +37,7 @@ import com.mogo.och.taxi.bean.OrderGrabRespBean;
import com.mogo.och.taxi.bean.OrderGrabStatusQueryRespBean;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean;
import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean;
import com.mogo.och.taxi.bean.OrdersListQueryRespBean;
import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean;
@@ -1045,9 +1046,39 @@ public class MogoOCHTaxiModelNew {
public void onAutopilotRotting(AutopilotRouteInfo routeList) {
if (null != routeList && routeList.getModels() != null){
mAutopilotPlanningCallback.routeResult(routeList.getModels());
updateOrderRoute(routeList.getModels());
}
}
};
/**
* 上报订单全路径规划数据
* @param models
*/
private void updateOrderRoute(List<AutopilotRouteInfo.RouteModels> models) {
List<OrderRouteUpdateReqBean.Result> points = new ArrayList<>();
for (int i =0; i < models.size(); i++){
OrderRouteUpdateReqBean.Result point = new OrderRouteUpdateReqBean.Result();
point.lat = models.get(i).getLat();
point.lon = models.get(i).getLon();
points.add(point);
}
OCHTaxiServiceManagerNew.getInstance().updateOrderRoute(mContext, mCurrentOCHOrder.orderNo
, points, new OCHTaxiServiceCallback<BaseData>() {
@Override
public void onSuccess(BaseData data) {
}
@Override
public void onFail(int code, String msg) {
}
});
}
/**
* END
*/

84
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceApiNew.java
View File

@@ -12,6 +12,7 @@ import com.mogo.och.taxi.bean.OrderQueryReqBean;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoReqBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean;
import com.mogo.och.taxi.bean.OrderStatusUpdateReqBean;
import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean;
import com.mogo.och.taxi.bean.OrdersListQueryReqBean;
@@ -21,6 +22,7 @@ import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean;
import io.reactivex.Observable;
import retrofit2.http.Body;
import retrofit2.http.GET;
import retrofit2.http.Header;
import retrofit2.http.Headers;
import retrofit2.http.POST;
import retrofit2.http.Query;
@@ -38,8 +40,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET("/autopilot-car-hailing/api/v1/driver/orderInService/query")
Observable<OrdersInServiceQueryRespBean> queryOrdersInAndWaitService(@Query("sn") String sn);
// @GET("/autopilot-car-hailing/api/v1/driver/orderInService/query")
@GET("/autopilot-car-hailing/order/v2/driver/taxi/orderInService/query")
Observable<OrdersInServiceQueryRespBean> queryOrdersInAndWaitService(@Header("appId") String appId, @Header("ticket") String ticket, @Query("sn") String sn);
/**
* 查询新到的预约单
@@ -47,8 +50,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET( "/autopilot-car-hailing/api/v1/driver/newBookingOrder/query" )
Observable<OrdersNewBookingQueryRespBean> queryNewBookingOrder(@Query("sn") String sn);
// @GET( "/autopilot-car-hailing/api/v1/driver/newBookingOrder/query" )
@GET( "/autopilot-car-hailing/order/v2/driver/taxi/newBookingOrder/query" )
Observable<OrdersNewBookingQueryRespBean> queryNewBookingOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn);
/**
* (预约单)执行抢单动作
@@ -56,8 +60,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/grabOrder" )
Observable<OrderGrabRespBean> grabOrder(@Body OrderGrabReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/grabOrder" )
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/grabOrder" )
Observable<OrderGrabRespBean> grabOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrderGrabReqBean data);
/**
* (预约单)查询抢单结果
@@ -65,8 +70,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/grabStatus/query" )
Observable<OrderGrabStatusQueryRespBean> queryOrderGrabStatus(@Body OrderGrabReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/grabStatus/query" )
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/grabStatus/query" )
Observable<OrderGrabStatusQueryRespBean> queryOrderGrabStatus(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrderGrabReqBean data);
/**
* 查询订单路径规划信息（到上车点、起始点间的距离和预估时间）
@@ -74,8 +80,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/routeInfo/query" )
Observable<OrderQueryRouteInfoRespBean> queryOrderRouteInfo(@Body OrderQueryRouteInfoReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/routeInfo/query" )
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/routeInfo/query" )
Observable<OrderQueryRouteInfoRespBean> queryOrderRouteInfo(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrderQueryRouteInfoReqBean data);
/**
* 通过orderId查询订单信息（用于本地已经有orderId时）
@@ -84,8 +91,9 @@ interface OCHTaxiServiceApiNew {
* @deprecated v2.1_0930需求中暂不再使用此接口
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/queryOrderById" )
Observable<OrderQueryRespBean> queryOrderById(@Body OrderQueryReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/queryOrderById" )
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/queryOrderById" )
Observable<OrderQueryRespBean> queryOrderById(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrderQueryReqBean data);
/**
* 查询服务中订单信息（用于本地无orderId时）
@@ -95,15 +103,17 @@ interface OCHTaxiServiceApiNew {
* @deprecated v2.1_0930需求中暂不再使用此接口
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET( "/autopilot-car-hailing/api/v1/driver/queryOrderInService" )
Observable<OrderQueryRespBean> queryOrderInService(@Query("sn") String sn);
// @GET( "/autopilot-car-hailing/api/v1/driver/queryOrderInService" )
@GET( "/autopilot-car-hailing/order/v2/driver/taxi/queryOrderInService" )
Observable<OrderQueryRespBean> queryOrderInService(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn);
/**
* 取消订单
*/
@Headers({"Content-type:application/json;charset=UTF-8"})
@POST("/autopilot-car-hailing/api/v1/driver/cancelOrder")
Observable<BaseData> cancelOrder(@Body OrderCancelReqBean data);
// @POST("/autopilot-car-hailing/api/v1/driver/cancelOrder")
@POST("/autopilot-car-hailing/order/v2/driver/taxi/cancelOrder")
Observable<BaseData> cancelOrder(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrderCancelReqBean data);
/**
* 订单列表获取
@@ -111,8 +121,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/queryOrders" )
Observable<OrdersListQueryRespBean> queryOrdersList(@Body OrdersListQueryReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/queryOrders" )
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/queryOrders" )
Observable<OrdersListQueryRespBean> queryOrdersList(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrdersListQueryReqBean data);
/**
* 订单状态更新
@@ -120,8 +131,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/order/updateStatus" )
Observable<BaseData> updateOrderStatus(@Body OrderStatusUpdateReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/order/updateStatus" )
@POST( "/autopilot-car-hailing/order/v2/driver/taxi/order/updateStatus" )
Observable<BaseData> updateOrderStatus(@Header ("appId") String appId,@Header("ticket") String ticket,@Body OrderStatusUpdateReqBean data);
/**
* 收车/出车状态更新
@@ -129,8 +141,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/serviceStatus/update" )
Observable<BaseData> updateDriverServiceStatus(@Body DriverStatusUpdateReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/serviceStatus/update" )
@POST( "/autopilot-car-hailing/car/v2/driver/taxi/serviceStatus/update" )
Observable<BaseData> updateDriverServiceStatus(@Header ("appId") String appId,@Header("ticket") String ticket,@Body DriverStatusUpdateReqBean data);
/**
* 收车/出车状态查询
@@ -138,8 +151,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET( "/autopilot-car-hailing/api/v1/driver/serviceStatus/query" )
Observable<DriverStatusQueryRespBean> queryDriverServiceStatus(@Query("sn") String sn);
// @GET( "/autopilot-car-hailing/api/v1/driver/serviceStatus/query" )
@GET( "/autopilot-car-hailing/car/v2/driver/taxi/serviceStatus/query" )
Observable<DriverStatusQueryRespBean> queryDriverServiceStatus(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn);
/**
* 车机端上传心跳数据（只在出车状态时上传）：包含高德坐标系经纬度
@@ -147,8 +161,9 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST( "/autopilot-car-hailing/api/v1/driver/heartbeat" )
Observable<BaseData> runCarHeartbeat(@Body CarHeartbeatReqBean data);
// @POST( "/autopilot-car-hailing/api/v1/driver/heartbeat" )
@POST( "/autopilot-car-hailing/location/v2/driver/taxi/heartbeat" )
Observable<BaseData> runCarHeartbeat(@Header ("appId") String appId,@Header("ticket") String ticket,@Body CarHeartbeatReqBean data);
/**
* 查询司机服务数据
@@ -156,6 +171,19 @@ interface OCHTaxiServiceApiNew {
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@GET( "/autopilot-car-hailing/api/v1/driver/serviceData/query" )
Observable<DriverServiceDataRespBean> queryServiceData(@Query("sn") String sn);
// @GET( "/autopilot-car-hailing/api/v1/driver/serviceData/query" )
@GET( "/autopilot-car-hailing/order/v2/driver/taxi/serviceData/query" )
Observable<DriverServiceDataRespBean> queryServiceData(@Header ("appId") String appId,@Header("ticket") String ticket,@Query("sn") String sn);
/**
* 上传工控机返回的全路径规划数据
* @param appId
* @param ticket
* @param data
* @return
*/
@Headers( {"Content-type:application/json;charset=UTF-8"} )
@POST("/autopilot-car-hailing/order/v2/driver/taxi/orderRoute")
// @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);
}

79
OCH/mogo-och-taxi/src/main/java/com/mogo/och/taxi/network/OCHTaxiServiceManagerNew.java
View File

@@ -20,6 +20,7 @@ import com.mogo.och.taxi.bean.OrderQueryReqBean;
import com.mogo.och.taxi.bean.OrderQueryRespBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoReqBean;
import com.mogo.och.taxi.bean.OrderQueryRouteInfoRespBean;
import com.mogo.och.taxi.bean.OrderRouteUpdateReqBean;
import com.mogo.och.taxi.bean.OrderStatusUpdateReqBean;
import com.mogo.och.taxi.bean.OrdersInServiceQueryRespBean;
import com.mogo.och.taxi.bean.OrdersListQueryReqBean;
@@ -27,6 +28,8 @@ import com.mogo.och.taxi.bean.OrdersListQueryRespBean;
import com.mogo.och.taxi.bean.OrdersNewBookingQueryRespBean;
import com.mogo.och.taxi.constant.OCHTaxiConst;
import java.util.List;
import io.reactivex.android.schedulers.AndroidSchedulers;
import io.reactivex.schedulers.Schedulers;
@@ -65,7 +68,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getSn())
mOCHTaxiServiceApi.queryOrdersInAndWaitService(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryOrdersInAndWaitService"));
@@ -82,7 +87,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryNewBookingOrder(MoGoAiCloudClientConfig.getInstance().getSn())
mOCHTaxiServiceApi.queryNewBookingOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryNewBookingOrder"));
@@ -100,7 +107,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.grabOrder(new OrderGrabReqBean(
mOCHTaxiServiceApi.grabOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderGrabReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -119,7 +128,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrderGrabStatus(new OrderGrabReqBean(
mOCHTaxiServiceApi.queryOrderGrabStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderGrabReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -138,7 +149,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrderRouteInfo(new OrderQueryRouteInfoReqBean(
mOCHTaxiServiceApi.queryOrderRouteInfo(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderQueryRouteInfoReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -158,7 +171,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrderById(new OrderQueryReqBean(
mOCHTaxiServiceApi.queryOrderById(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderQueryReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -178,7 +193,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrderInService(MoGoAiCloudClientConfig.getInstance().getSn())
mOCHTaxiServiceApi.queryOrderInService(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryOrderInService"));
@@ -198,7 +215,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.cancelOrder(new OrderCancelReqBean(
mOCHTaxiServiceApi.cancelOrder(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderCancelReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId, cancelType, cancelReason))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -218,7 +237,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryOrdersList(new OrdersListQueryReqBean(
mOCHTaxiServiceApi.queryOrdersList(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrdersListQueryReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), page, size))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -238,7 +259,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.updateOrderStatus(new OrderStatusUpdateReqBean(
mOCHTaxiServiceApi.updateOrderStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderStatusUpdateReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), orderId, orderStatus))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -257,7 +280,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.updateDriverServiceStatus(new DriverStatusUpdateReqBean(
mOCHTaxiServiceApi.updateDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new DriverStatusUpdateReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), status))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -275,7 +300,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getSn())
mOCHTaxiServiceApi.queryDriverServiceStatus(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryDriverServiceStatus"));
@@ -294,7 +321,9 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.runCarHeartbeat(new CarHeartbeatReqBean(
mOCHTaxiServiceApi.runCarHeartbeat(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new CarHeartbeatReqBean(
MoGoAiCloudClientConfig.getInstance().getSn(), lon, lat))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
@@ -312,12 +341,34 @@ public class OCHTaxiServiceManagerNew {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.queryServiceData(MoGoAiCloudClientConfig.getInstance().getSn())
mOCHTaxiServiceApi.queryServiceData(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,MoGoAiCloudClientConfig.getInstance().getSn())
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context, callback, "queryDriverServiceData"));
}
/**
* 根据订单上传工控机返回的全路径规划数据
* @param context
* @param orderNo
* @param callback
*/
public void updateOrderRoute(Context context, long orderNo, List<OrderRouteUpdateReqBean.Result> points,
OCHTaxiServiceCallback<BaseData> callback){
if ( mOCHTaxiServiceApi == null ) {
mOCHTaxiServiceApi = MogoApisHandler.getInstance().getApis().getNetworkApi()
.create(OCHTaxiServiceApiNew.class, baseUrl);
}
mOCHTaxiServiceApi.updateOrderRoute(MoGoAiCloudClientConfig.getInstance().getServiceAppId()
,MoGoAiCloudClientConfig.getInstance().getToken()
,new OrderRouteUpdateReqBean(orderNo,points))
.subscribeOn(Schedulers.io())
.observeOn(AndroidSchedulers.mainThread())
.subscribe(getSubscribeImpl(context,callback,"updateOrderRoute"));
}
private <T extends BaseData> SubscribeImpl getSubscribeImpl(
Context context, OCHTaxiServiceCallback<T> callback, String apiName) {
return new SubscribeImpl<T>(RequestOptions.create(context)) {