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

2020-09-08 15:33:50 +08:00
parent e9880f35a3 62bdbd5b6b
commit cf2460b54e
62 changed files with 811 additions and 111 deletions
--- a/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
+++ b/libraries/tanlulib/src/main/java/com/zhidao/roadcondition/service/CosStatusController.kt
@@ -136,6 +136,7 @@ class CosStatusController : CosStatusCallback {
            }
            Log.d(TAG, "videoAndThumbMap ${videoAndThumbMap}")
            if (videoAndThumbMap.size == 2) {
+                trackUploadCos(4)
                Log.d(TAG, "videoAndThumbMap.size == 2 ")
                var locationInfo = LocationUtil.getInstance().getLocationInfo()
                val locationStr: String = Gson().toJson(locationInfo)
@@ -149,7 +150,6 @@ class CosStatusController : CosStatusCallback {
                        sendGetInfoFailedReceiver("100")
                    }
                } else {
-                    trackUploadCos(4)
                    //分享成功，并打点，如果是上报拥堵，需要takeVideo
                    LatLngStickyEventBus.getInstance()
                            .postSticky(GetImageSuccessEvent(downloadUrl, mType))