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

[Taxi无人化] refactor: 调整开始任务接口；

Browse Source
This commit is contained in:
aibingbing
2023-08-17 18:57:00 +08:00
parent 950be3fcea
commit d49edb954e
4 changed files with 9 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/bean/TaxiPassengerStartReqBean.java
View File

@@ -8,13 +8,12 @@ public class TaxiPassengerStartReqBean {
public String orderNo;
public String sn;
public Double gcjLat;
public Double gcjLon;
public TaxiPassengerStartReqBean(String sn, String orderNo, Double gcjLat, Double gcjLon) {
public Long lineId;
public TaxiPassengerStartReqBean(String sn, String orderNo, Long lineId) {
this.sn = sn;
this.orderNo = orderNo;
this.gcjLat = gcjLat;
this.gcjLon = gcjLon;
this.lineId = lineId;
}
}

5
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/model/AutopilotManager.kt
View File

@@ -188,11 +188,10 @@ object AutopilotManager : IMoGoAutopilotStatusListener {
*/
private fun startAutoPilotServiceByPassenger() {
if (TaxiPassengerModel.currentOCHOrder == null) return
val currentLocation = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
//val currentLocation = CallerChassisLocationGCJ02ListenerManager.getChassisLocationGCJ02()
TaxiPassengerServiceManager.startAutoPilotServiceByPassenger(
TaxiPassengerModel.currentOCHOrder!!.orderNo,
currentLocation.latitude,
currentLocation.longitude,
TaxiPassengerModel.currentLineId,
object : OchCommonServiceCallback<TaxiPassengerBaseRespBean> {
override fun onSuccess(data: TaxiPassengerBaseRespBean) {
VoiceNotice.showNotice("坐稳扶好，我们出发咯！", AIAssist.LEVEL2)

2
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceApi.kt
View File

@@ -81,7 +81,7 @@ internal interface TaxiPassengerServiceApi {
* @return
*/
@Headers("Content-type:application/json;charset=UTF-8")
@POST("/och-taxi-cabin/api/flow/v1/startService")
@POST("/och-taxi-cabin/api/flow/v1/startTask")
fun startAutoPilotServiceByPassenger(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String= MoGoAiCloudClientConfig.getInstance().token,

5
OCH/taxi/taxi-unmanned-passenger/src/main/java/com/mogo/och/taxi/passenger/network/TaxiPassengerServiceManager.kt
View File

@@ -110,15 +110,14 @@ object TaxiPassengerServiceManager {
@JvmStatic
fun startAutoPilotServiceByPassenger(
orderNo: String?,
gcjLat: Double?,
gcjLon: Double?,
lineId: Long?,
callback: OchCommonServiceCallback<TaxiPassengerBaseRespBean>?
) {
if (beforeNet()) {
return
}
mOCHTaxiServiceApi.startAutoPilotServiceByPassenger(
data = TaxiPassengerStartReqBean(driverSn, orderNo, gcjLat, gcjLon)
data = TaxiPassengerStartReqBean(driverSn, orderNo, lineId)
)
.transformTry()
.retry(3)