Merge remote-tracking branch 'origin/dev2_aiSdk' into dev2_aiSdk

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt

@@ -1,6 +1,7 @@
 package com.zhidao.roadcondition.service
 
 import android.content.Intent
+import android.os.Environment
 import android.util.Log
 import com.google.gson.Gson
 import com.mogo.commons.AbsMogoApplication
@@ -11,10 +12,8 @@ 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.*
+import java.io.File
 
 /**
  * @description cos上传操作
@@ -44,6 +43,10 @@ class CosStatusController : CosStatusCallback {
     private var mLongitude: Double = 0.0
     private var mLatitude: Double = 0.0
     private var mSpeed: Float = 0f
+    val moviesDir = Environment.getExternalStoragePublicDirectory(
+            Environment.DIRECTORY_MOVIES + File.separator
+    )
+
 
     //上传文件
     fun uploadFile(picPath: MutableList<String?>?, entity: TakeEntity, type: String, mainInfoId: Long,
@@ -103,6 +106,7 @@ class CosStatusController : CosStatusCallback {
             CosCallbackMapController.unregisterCallback(localPath)
             InformationUploadController.release(entity.id)
 //            deletePicFile(localPath)
+            deleteCompressVideoFile(moviesDir.toString())
         }
     }
 
@@ -154,7 +158,8 @@ class CosStatusController : CosStatusCallback {
         }
         Log.d(TAG, "delete file: $localPath")
         CosCallbackMapController.unregisterCallback(localPath)
-        deletePicFile(localPath)
+//        deletePicFile(localPath)
+        deleteCompressVideoFile(moviesDir.toString())
     }
 
     private fun sendInformation(type: Int, map: Map<String, String>) {

libraries/tanlulib/src/main/java/com/zhidao/roadcondition/util/FileUtil.kt

@@ -107,6 +107,17 @@ fun bitmapToFile(bitmap: Bitmap?, filePath: String): Boolean {
     return true
 }
 
+fun deleteCompressVideoFile(path: String?) {
+    val file = File(path)
+    val files = file.listFiles()
+    for (f in files) {
+        // /storage/emulated/0/Movies/compress_video_20210202121826.mp4
+        if (f.toString().contains("compress_video")) {
+            f.delete()
+        }
+    }
+}
+
 
 //获取压缩后的视频路径
 fun getCompressVideoPath(): String {