From 625a5e743f10fcf09bb6c58b22168252c8ce2b83 Mon Sep 17 00:00:00 2001
From: lixiaopeng <lixiaopeng@zhidaoauto.com>
Date: Thu, 3 Sep 2020 20:07:15 +0800
Subject: [PATCH] opt

---
 .idea/misc.xml                                             | 2 +-
 .../zhidao/roadcondition/service/CosStatusController.kt    | 7 +++----
 .../java/com/zhidao/roadcondition/util/AnalyticsUtil.kt    | 2 +-
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/.idea/misc.xml b/.idea/misc.xml
index 21e99e2dc0..cd77a1f062 100644
--- a/.idea/misc.xml
+++ b/.idea/misc.xml
@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>
\ No newline at end of file
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 6ef394fe31..836d01608a 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
@@ -121,7 +121,6 @@ class CosStatusController : CosStatusCallback {
             downloadUrl: String?,
             localPath: String?
     ) {
-        Log.d(TAG, "uploadFile mType= $mType")
         Log.d(TAG, "uploadCosCompleted localPath = $localPath")
         Log.d(TAG, "uploadCosCompleted downloadUrl = $downloadUrl")
         Log.d(TAG, "uploadCosCompleted cosPath = $cosPath")
@@ -150,17 +149,19 @@ class CosStatusController : CosStatusCallback {
                         sendGetInfoFailedReceiver("100")
                     }
                 } else {
+                    trackUploadCos(4)
                     //分享成功，并打点，如果是上报拥堵，需要takeVideo
                     LatLngStickyEventBus.getInstance()
                             .postSticky(GetImageSuccessEvent(downloadUrl, mType))
                     //上传录像以及缩略图成功
                     sendInformation(INFO_TYPE_VIDEO, videoAndThumbMap)
                 }
+            } else {
+                trackUploadCos(5)
             }
         } else {
             //上传图片成功, 如果是上报路况，直接上传，TODO
             Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType")
-//            if (mType.equals("1") || mType.equals("-1")) {
             sendInformationDirectly(
                     INFO_TYPE_IMG,
                     mutableMapOf("pic" to downloadUrl as String),
@@ -170,7 +171,6 @@ class CosStatusController : CosStatusCallback {
                     mLongitude,
                     mLatitude
             )
-//            }
         }
         Log.d(TAG, "delete file: ${localPath!!}")
         CosCallbackMapController.unregisterCallback(localPath)
@@ -200,7 +200,6 @@ class CosStatusController : CosStatusCallback {
             longitude: Double,
             latitude: Double
     ) {
-        Log.d(TAG, "sendInformationDirectly  isCustomSend = ${entity?.isCustom}")
         Log.d(TAG, "sendInformationDirectly  poiType= $poiType ---- mainInfoId= $mainInfoId")
         //开始上传
         entity?.isCustom?.let {
diff --git a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
index 1e48a22717..3ef6ac2e10 100644
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/AnalyticsUtil.kt
@@ -28,7 +28,7 @@ const val CarNet_Get_Strategy:String = "CarNet_Get_Strategy" //策略拉取成
 const val CarNet_Create_Task:String = "CarNet_Create_Task" //创建定时任务
 const val CarNet_Get_Picture:String = "CarNet_Get_Picture" //获取图片,type=1 调用, type=2 成功, type=3 失败
 const val CarNet_Get_Video:String = "CarNet_Get_Video" //获取视频,type=1 调用,type=2 成功,type=3 失败
-const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始
+const val CarNet_Cos_Upload:String = "CarNet_Cos_Upload" //上传COS, type=1 成功, type=2 失败, type=3 开始， type=4 成功返回视频和缩略图，type=5 成功没有返回全视频和缩略图
 const val CarNet_Servers_Upload:String = "CarNet_Servers_Upload" //上传服务端, type=1 成功,type=2 失败, type=3 开始
 const val CarNet_Voice_Search:String = "CarNet_Voice_Search" //语音搜索路况,type=1 成功,type=2 失败
 const val CarNet_USER_SHOW:String = "CarNet_user_show" //情报展示时长,showtime 加载列表时长