[6.7.0]

[fix] [核销接口变更]
2024-10-31 11:42:44 +08:00
parent 376dda8e6d
commit 7c1ca46ea7
10 changed files with 57 additions and 37 deletions
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/model/TicketModel.kt
@@ -106,9 +106,14 @@ object TicketModel : IOchOnMessageListener<WriteOffPassenger>{
                    firstStation.siteId.toLong(),
                    object : OchCommonServiceCallback<WriteOffCountResponse> {
                        override fun onSuccess(data: WriteOffCountResponse?) {
-                            data?.data?.let {
-                                emitterMain?.onNext(Pair<Int,Int>(firstStation.siteId,it))
-                                d(SceneConstant.M_BUS + TAG, "${firstStation.name}核销人数:${it}")
+                            data?.let {
+                                val count = if(it.data==null){
+                                    0
+                                }else{
+                                    it.data
+                                }
+                                emitterMain?.onNext(Pair<Int,Int>(firstStation.siteId,count))
+                                d(SceneConstant.M_BUS + TAG, "${firstStation.name}核销人数:${count}")
                                OchChainLogManager.writeChainLog("核销人数","任务:${currentTask.taskId} zhan'dian")
                            }
                        }
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/impl/WeaknetRepository.kt
@@ -320,7 +320,7 @@ class WeaknetRepository : IRepository {
        siteId: Long,
        callback: OchCommonServiceCallback<WriteOffCountResponse>?
    ) {
-        weakNetInterface?.writeOffCount(context,taskId.toString(),siteId.toString(),callback)
+        weakNetInterface?.writeOffCount(context,taskId,siteId,callback)
    }

    override fun queryCarExecutableTaskList(
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/request/WriteOffCountReqBean.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/bean/request/WriteOffCountReqBean.kt
@@ -0,0 +1,3 @@
+package com.mogo.och.weaknet.repository.net.bean.request
+
+data class WriteOffCountReqBean(val sn:String,val taskId:Long,val siteId:Long)
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/WeakNetInterface.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/WeakNetInterface.java
@@ -17,8 +17,8 @@ public interface WeakNetInterface {

    void writeOffCount(
            Context context ,
-            String taskId,
-            String siteId,
+            Long taskId,
+            Long siteId,
            OchCommonServiceCallback<WriteOffCountResponse> callback
    );

--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/dali/shuttle/DaliShuttleServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/dali/shuttle/DaliShuttleServiceManager.kt
@@ -52,15 +52,15 @@ object DaliShuttleServiceManager: WeakNetInterface {
     */
    override fun writeOffCount(
        context: Context,
-        taskId: String?,
-        siteId: String?,
+        taskId: Long?,
+        siteId: Long?,
        callback: OchCommonServiceCallback<WriteOffCountResponse>?
    ) {
        mService.writeOffCount(
            MoGoAiCloudClientConfig.getInstance().serviceAppId,
            SharedPrefsMgr.getInstance().token,
-            taskId,
-            siteId
+            taskId?.toString(),
+            siteId?.toString()
        )
            .transformIoTry()
            .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/bus/ISaasBusApiService.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/bus/ISaasBusApiService.java
@@ -6,6 +6,7 @@ import com.mogo.och.weaknet.bean.response.BusRoutesResponse;
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse;
 import com.mogo.och.weaknet.bean.request.ShuttleEventRequest;
 import com.mogo.och.weaknet.bean.response.WriteOffCountResponse;
+import com.mogo.och.weaknet.repository.net.bean.request.WriteOffCountReqBean;

 import io.reactivex.Observable;
 import retrofit2.http.Body;
@@ -38,8 +39,8 @@ public interface ISaasBusApiService {
     * 查询当前站点核销的人数
     */
    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @GET("/och-vehicle/api/car/v2/device/writeOff")
-    Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("taskId") String taskId, @Query("siteId") String siteId);
+    @POST("/och-vehicle/api/car/v2/task/site/writeOffCount")
+    Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Body WriteOffCountReqBean writeOffCountReqBean);

    /**
     * 同步 线路、站点、任务、自驾轨迹信息
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/bus/SaasBusServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/bus/SaasBusServiceManager.kt
@@ -6,6 +6,7 @@ import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.cache.OchSPManager
 import com.mogo.och.common.module.network.OchCommonNet
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.network.OchCommonSubscribeImpl
@@ -15,6 +16,7 @@ import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
 import com.mogo.och.weaknet.bean.request.ShuttleEventRequest
 import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
+import com.mogo.och.weaknet.repository.net.bean.request.WriteOffCountReqBean
 import com.mogo.och.weaknet.repository.net.weaknet.WeakNetInterface
 import io.reactivex.Observable

@@ -52,18 +54,22 @@ object SaasBusServiceManager: WeakNetInterface {
     */
    override fun writeOffCount(
        context: Context,
-        taskId: String?,
-        siteId: String?,
+        taskId: Long,
+        siteId: Long,
        callback: OchCommonServiceCallback<WriteOffCountResponse>?
    ) {
-        mService.writeOffCount(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            SharedPrefsMgr.getInstance().token,
-            taskId,
-            siteId
-        )
-            .transformIoTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+        OchSPManager.getSn()?.let {
+            mService.writeOffCount(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                SharedPrefsMgr.getInstance().token,
+                WriteOffCountReqBean(it,taskId,
+                    siteId,
+                )
+            )
+                .transformIoTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+        }
+
    }

    /**
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/shuttle/ISaasShuttleApiService.java
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/shuttle/ISaasShuttleApiService.java
@@ -6,6 +6,7 @@ import com.mogo.och.weaknet.bean.response.BusRoutesResponse;
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse;
 import com.mogo.och.weaknet.bean.request.ShuttleEventRequest;
 import com.mogo.och.weaknet.bean.response.WriteOffCountResponse;
+import com.mogo.och.weaknet.repository.net.bean.request.WriteOffCountReqBean;

 import io.reactivex.Observable;
 import retrofit2.http.Body;
@@ -38,8 +39,8 @@ public interface ISaasShuttleApiService {
     * 查询当前站点核销的人数
     */
    @Headers( {"Content-type:application/json;charset=UTF-8"} )
-    @GET("/och-vehicle/api/car/v2/device/writeOff")
-    Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket, @Query("taskId") String taskId, @Query("siteId") String siteId);
+    @POST("/och-vehicle/api/car/v2/task/site/writeOffCount")
+    Observable<WriteOffCountResponse> writeOffCount(@Header ("appId") String appId, @Header("ticket") String ticket,  @Body WriteOffCountReqBean writeOffCountReqBean);

    /**
     * 同步 线路、站点、任务、自驾轨迹信息
--- a/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/shuttle/SaasShuttleServiceManager.kt
+++ b/OCH/shuttle/driver_weaknet/src/main/java/com/mogo/och/weaknet/repository/net/weaknet/saas/shuttle/SaasShuttleServiceManager.kt
@@ -6,6 +6,7 @@ import com.mogo.commons.storage.SharedPrefsMgr
 import com.mogo.eagle.core.data.BaseData
 import com.mogo.eagle.core.network.MoGoRetrofitFactory
 import com.mogo.och.common.module.constant.OchCommonConst
+import com.mogo.och.common.module.manager.cache.OchSPManager
 import com.mogo.och.common.module.network.OchCommonNet
 import com.mogo.och.common.module.network.OchCommonServiceCallback
 import com.mogo.och.common.module.network.OchCommonSubscribeImpl
@@ -15,6 +16,7 @@ import com.mogo.och.weaknet.bean.request.BusQueryLineStationsRequest
 import com.mogo.och.weaknet.bean.response.CarExecutableTaskResponse
 import com.mogo.och.weaknet.bean.request.ShuttleEventRequest
 import com.mogo.och.weaknet.bean.response.WriteOffCountResponse
+import com.mogo.och.weaknet.repository.net.bean.request.WriteOffCountReqBean
 import com.mogo.och.weaknet.repository.net.weaknet.WeakNetInterface
 import io.reactivex.Observable

@@ -52,18 +54,22 @@ object SaasShuttleServiceManager: WeakNetInterface {
     */
    override fun writeOffCount(
        context: Context,
-        taskId: String?,
-        siteId: String?,
+        taskId: Long,
+        siteId: Long,
        callback: OchCommonServiceCallback<WriteOffCountResponse>?
    ) {
-        mService.writeOffCount(
-            MoGoAiCloudClientConfig.getInstance().serviceAppId,
-            SharedPrefsMgr.getInstance().token,
-            taskId,
-            siteId
-        )
-            .transformIoTry()
-            .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+        OchSPManager.getSn()?.let {
+            mService.writeOffCount(
+                MoGoAiCloudClientConfig.getInstance().serviceAppId,
+                SharedPrefsMgr.getInstance().token,
+                WriteOffCountReqBean(
+                    it, taskId,
+                    siteId,
+                )
+            )
+                .transformIoTry()
+                .subscribe(OchCommonSubscribeImpl(context, callback, "writeOffCount"))
+        }
    }

    /**
@@ -76,7 +82,7 @@ object SaasShuttleServiceManager: WeakNetInterface {
        mService.queryCarExecutableTaskList(
            MoGoAiCloudClientConfig.getInstance().serviceAppId,
            SharedPrefsMgr.getInstance().token,
-            SharedPrefsMgr.getInstance().sn,
+            OchSPManager.getSn()
        )
            .transformIoTry()
            .subscribe(OchCommonSubscribeImpl(context, callback, "queryCarExecutableTaskList"))
--- a/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
+++ b/OCH/shuttle/driver_weaknet/src/main/res/layout/shuttle_weak_base_fragment.xml
@@ -16,7 +16,6 @@
        android:id="@+id/boneContainerView"
        android:layout_width="@dimen/dp_1046"
        android:layout_height="match_parent"
-        android:elevation="100dp"
        android:visibility="visible"
        app:layout_constraintLeft_toLeftOf="parent"
        app:layout_constraintTop_toTopOf="parent" />
@@ -32,7 +31,6 @@
        app:layout_constraintTop_toTopOf="parent" />

    <com.mogo.och.common.module.wigets.LoadingMapStatusView
-        android:elevation="120dp"
        android:layout_width="match_parent"
        android:layout_height="match_parent" />