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 290bbba5d7..fbf5d66b3c 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 @@ -12,10 +12,7 @@ import com.zhidao.roadcondition.event.GetImageSuccessEvent import com.zhidao.roadcondition.event.LatLngStickyEventBus import com.zhidao.roadcondition.model.proxy.INFO_TYPE_IMG import com.zhidao.roadcondition.model.proxy.INFO_TYPE_VIDEO -import com.zhidao.roadcondition.util.CarNet_Cos_Upload -import com.zhidao.roadcondition.util.LocationUtil -import com.zhidao.roadcondition.util.deletePicFile -import com.zhidao.roadcondition.util.trackNormalEvent +import com.zhidao.roadcondition.util.* /** * @description cos上传操作 @@ -96,23 +93,23 @@ class CosStatusController : CosStatusCallback { } } - if (!isRetry) { - isRetry = true +// if (!isRetry) { +// isRetry = true // taskAsync(30_000) { //去掉重试 // try { -// uploadFile(mutableListOf(localPath as String), entity, mType) +// uploadFile(mutableListOf(localPath as String), entity, mType, mainInfoId, mFromType, mLongitude, mLatitude) // } catch (e: Exception) { // e.printStackTrace() // } // } - } else { +// } else { if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) { CosCallbackMapController.uploadFailed?.invoke() } CosCallbackMapController.unregisterCallback(localPath) InformationUploadController.release(entity?.id) -// deletePicFile(localPath) - } + deletePicFile(localPath) +// } } override fun uploadCosCompleted( 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 29b5ad35cb..bb763b563f 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 开始, type=4 成功返回视频和缩略图,type=5 成功没有返回全视频和缩略图 +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 加载列表时长