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

[m1]

Browse Source 
[1.1.2]
[sn 抽取]
This commit is contained in:
yangyakun
2023-03-07 22:44:41 +08:00
parent 6929663286
commit 33966e4e76
2 changed files with 18 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/BusPassengerServiceManager.kt
View File

@@ -23,8 +23,16 @@ object BusPassengerServiceManager {
MoGoRetrofitFactory.getInstance(OchCommonConst.getBaseUrl())
.create(PassengerServiceApi::class.java)
/**
* 获取Bus司机端的sn
* @return
*/
val draiverSn: String
get() = CallerTelematicManager.getServerToken()
private fun beforeNet():Boolean{
if (CallerTelematicManager.getServerToken().isBlank()) {
if (draiverSn.isBlank()) {
ToastUtils.showShort("已断开司机屏连接、请联系安全员")
return true
}
@@ -87,7 +95,7 @@ object BusPassengerServiceManager {
if(beforeNet()){
return
}
val endOrderRequest = EndOrderRequest(CallerTelematicManager.getServerToken(),orderNo)
val endOrderRequest = EndOrderRequest(draiverSn,orderNo)
mBusPassengerServiceApi.endOrder(request = endOrderRequest).transformTry()
.subscribe(OchCommonSubscribeImpl(context, callback, "serviceEnd"))
}
@@ -96,7 +104,7 @@ object BusPassengerServiceManager {
if(beforeNet()){
return
}
val request = ArriveDestRequest(CallerTelematicManager.getServerToken(),lindId)
val request = ArriveDestRequest(draiverSn,lindId)
mBusPassengerServiceApi.arriveDest(request = request).transformTry()
.subscribe(OchCommonSubscribeImpl(context, callback, "arriveDest"))
}

14
OCH/mogo-och-charter-passenger/src/m1/java/com/mogo/och/bus/passenger/net/PassengerServiceApi.kt
View File

@@ -20,7 +20,7 @@ internal interface PassengerServiceApi {
fun queryDriverOperationStatus(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken()
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn
): Observable<M1DriverLoginStatusResponse>
/**
@@ -30,7 +30,7 @@ internal interface PassengerServiceApi {
fun queryOrderInfo(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken()
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn
): Observable<OrderInfoResponse>
/**
@@ -40,7 +40,7 @@ internal interface PassengerServiceApi {
fun queryLineList(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken()
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn
): Observable<LineInfoListResponse>
/**
@@ -50,7 +50,7 @@ internal interface PassengerServiceApi {
fun queryLineSiteList(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken(),
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn,
@Query("lineId") lineId: String?
): Observable<SiteInfoResponse>
@@ -62,7 +62,7 @@ internal interface PassengerServiceApi {
fun queryBusinessStatus(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken()
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn
): Observable<BusinessStatusResponse>
/**
@@ -93,7 +93,7 @@ internal interface PassengerServiceApi {
fun queryLocusByLineId(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken(),
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn,
@Query("lineId") lineId: String?
): Observable<LocusResponse>
@@ -105,6 +105,6 @@ internal interface PassengerServiceApi {
fun queryBusinessTime(
@Header("appId") appId: String = MoGoAiCloudClientConfig.getInstance().serviceAppId,
@Header("ticket") ticket: String=MoGoAiCloudClientConfig.getInstance().token,
@Query("sn") sn: String = CallerTelematicManager.getServerToken()
@Query("sn") sn: String = BusPassengerServiceManager.draiverSn
): Observable<BusinessTimeResponse>
}