From 187df05167680d6b364b3933636a9006a5250755 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Thu, 27 Aug 2020 14:15:14 +0800
Subject: [PATCH] =?UTF-8?q?=E7=AD=96=E7=95=A5=E4=B8=8A=E6=8A=A5=EF=BC=9A?=
 =?UTF-8?q?=E8=87=AA=E5=8A=A8=E6=8B=A5=E5=A0=B5=20=E6=8E=A5=E5=8F=A3?=
 =?UTF-8?q?=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../com/mogo/module/share/bean/AverateSpeedResponse.kt |  2 +-
 .../java/com/mogo/module/share/net/ShareApiService.kt  |  2 +-
 .../module/share/strategyreceiver/BlockStrategy.kt     | 10 ++++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt
index 5f843cd862..bb747b4a14 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/bean/AverateSpeedResponse.kt
@@ -3,4 +3,4 @@ package com.mogo.module.share.bean
 import com.mogo.commons.data.BaseData
 
 data class AverateSpeedResponse(var result:Result):BaseData()
-data class Result(var upload:Boolean)
+data class Result(var upload:Boolean,var poiType:String)
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt
index 88b2e6262d..a0cf947886 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/net/ShareApiService.kt
@@ -22,5 +22,5 @@ interface ShareApiService {
      */
     @Headers("Content-type:application/json;charset=UTF-8")
     @POST("/deva/car/path/no/poiStrategyCheck/v1")
-    fun sendAverageSpeedForBlockStrategy(@Body request:RequestBody):Observable<AverateSpeedResponse>
+    fun sendAverageSpeedForBlockStrategy(@Body request:RequestBody,@Query("sn") sn:String):Observable<AverateSpeedResponse>
 }
\ No newline at end of file
diff --git a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
index 59a672b20a..1d4ef2cf98 100644
--- a/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
+++ b/modules/mogo-module-share/src/main/java/com/mogo/module/share/strategyreceiver/BlockStrategy.kt
@@ -4,6 +4,7 @@ import android.content.Context
 import android.os.SystemClock
 import android.util.ArrayMap
 import com.mogo.commons.network.SubscribeImpl
+import com.mogo.commons.network.Utils
 import com.mogo.map.MogoLatLng
 import com.mogo.module.share.bean.AverateSpeedResponse
 import com.mogo.module.share.constant.HttpConstant
@@ -12,6 +13,7 @@ import com.mogo.module.share.net.ShareApiService
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.tanlu.IMogoTanluProvider
 import com.mogo.service.tanlu.TanluUploadParams
+import com.mogo.utils.DeviceIdUtils
 import com.mogo.utils.logger.Logger
 import com.mogo.utils.network.RequestOptions
 import com.mogo.utils.network.utils.GsonUtil
@@ -92,17 +94,17 @@ class BlockStrategy(private val context: Context, private val apis: IMogoService
     }
 
     private fun uploadAverageSpeed(average: Float) {
-        val params = ArrayMap<String, String>()
-        params["speed"] = average.toString()
+        val params = ArrayMap<String, Any>()
+        params["speed"] = average.toInt()
         val body = RequestBody.create(MediaType.parse("Content-type:application/json;charset=UTF-8"), GsonUtil.jsonFromObject(params))
-        val disposable = apis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendAverageSpeedForBlockStrategy(body).subscribeOn(Schedulers.io()).subscribe(object : SubscribeImpl<AverateSpeedResponse>(RequestOptions.create(context)) {
+        val disposable = apis.networkApi.create(ShareApiService::class.java, HttpConstant.getNetHost()).sendAverageSpeedForBlockStrategy(body, Utils.getSn()).subscribeOn(Schedulers.io()).subscribe(object : SubscribeImpl<AverateSpeedResponse>(RequestOptions.create(context)) {
             override fun onSuccess(response: AverateSpeedResponse?) {
                 super.onSuccess(response)
                 response?.let {
                     Logger.d(TAG, "收到服务端返回结果： $it")
                     // 收到服务端回调，视情况进行视频上报
                     if (it.result.upload) {
-                        val p = TanluUploadParams(IMogoTanluProvider.TYPE_BLOCK, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO)
+                        val p = TanluUploadParams(it.result.poiType, IMogoTanluProvider.UPLOAD_FROM_STRATEGY_BLOCK_AUTO)
                         val location = ServiceApisManager.serviceApis.mapServiceApi.getSingletonLocationClient(context).lastKnowLocation
                         val latLon = MogoLatLng(location.latitude, location.longitude)
                         p.location = latLon