From 042cdf7cab00a13148d60c4ec60dc9b3b7487987 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Tue, 1 Dec 2020 16:50:49 +0800
Subject: [PATCH] opt

---
 .../roadcondition/service/CarCorderController.kt    | 13 ++++++++-----
 .../roadcondition/service/CosStatusController.kt    | 12 +++++++-----
 2 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
index b31a0437f6..0d6f65cfc8 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CarCorderController.kt
@@ -135,7 +135,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                     mainInfoId,
                     mLongitude,
                     mLatitude,
-                    mSpeed
+                    mSpeed,
+                    mFromType
             )
 
             //地图上打点
@@ -175,7 +176,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                     mainInfoId,
                     mLongitude,
                     mLatitude,
-                    mSpeed
+                    mSpeed,
+                    mFromType
             )
         }
 
@@ -350,7 +352,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 mainInfoId,
                 mLongitude,
                 mLatitude,
-                mSpeed
+                mSpeed,
+                mFromType
         )
 
         //地图上打点
@@ -424,9 +427,9 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                 mainInfoId,
                 mLongitude,
                 mLatitude,
-                mSpeed
+                mSpeed,
+                mFromType
         )
-
     }
 
     //获取图片
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
index 6aaa000d64..57bcbd692c 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -146,7 +146,8 @@ class CosStatusController : CosStatusCallback {
                     mainInfoId,
                     mLongitude,
                     mLatitude,
-                    mSpeed
+                    mSpeed,
+                    mFromType
             )
         }
         Log.d(TAG, "delete file: $localPath")
@@ -161,7 +162,7 @@ class CosStatusController : CosStatusCallback {
 //                CosCallbackMapController.mainService?.sendCustomResult(it)
 //            }
 //        } else {
-        sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude, mSpeed)
+        sendInformationDirectly(type, map, mType, entity, mainInfoId, mLongitude, mLatitude, mSpeed,mFromType)
 //        }
     }
 
@@ -176,13 +177,14 @@ class CosStatusController : CosStatusCallback {
             mainInfoId: Long,
             longitude: Double,
             latitude: Double,
-            speed: Float
+            speed: Float,
+            fromType: String
     ) {
-        Log.d(TAG, "sendInformationDirectly  poiType= $poiType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}")
+        Log.d(TAG, "sendInformationDirectly  poiType= $poiType --fromType =$fromType ---- mainInfoId= $mainInfoId --- isCustom = ${entity?.isCustom}")
         //开始上传
         entity?.isCustom?.let {
             mainServiceHttpModel.sendInformationMessage(
-                    fromType = mFromType,
+                    fromType = fromType,
                     type = type,
                     url = map,
                     isCustom = it,