opt upload

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

@@ -190,7 +190,7 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                         mainInfoId,
                         mLongitude,
                         mLatitude
-                );
+                )
             }
         }
     }

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

@@ -88,28 +88,31 @@ class CosStatusController : CosStatusCallback {
         ) {
 //            VoiceController.speakVoice("cos上报失败")
             Log.d(TAG, "uploadCosFailed  mType  = $mType")
-            if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
-                sendGetInfoFailedReceiver("100")
-            }
-        }
 
-//        if (!isRetry) {
-//            isRetry = true
-//            taskAsync(30_000) { //去掉重试
-//                try {
-//                    uploadFile(mutableListOf(localPath as String), entity, mType, mainInfoId, mFromType, mLongitude, mLatitude)
-//                } catch (e: Exception) {
-//                    e.printStackTrace()
-//                }
-//            }
-//        } else {
-            if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) {
-                CosCallbackMapController.uploadFailed?.invoke()
+            if (!isRetry) {
+                isRetry = true
+                taskAsync(5_000) { //去掉重试
+                    try {
+                        uploadFile(mutableListOf(localPath as String), entity, mType, mainInfoId, mFromType, mLongitude, mLatitude)
+                    } catch (e: Exception) {
+                        e.printStackTrace()
+                    }
+                }
+            } else {
+                //重试一次，如果还失败就提示
+                if (entity?.isCustom && mFromType != UPLOAD_FROM_STRATEGY_ACCIDENT_AUTO) {
+                    sendGetInfoFailedReceiver("100")
+                }
+
+                if (localPath!!.endsWith("mp4") || localPath!!.contains("Thumbnail")) {
+                    CosCallbackMapController.uploadFailed?.invoke()
+                }
+                CosCallbackMapController.unregisterCallback(localPath)
+                InformationUploadController.release(entity?.id)
+                deletePicFile(localPath)
             }
-            CosCallbackMapController.unregisterCallback(localPath)
-            InformationUploadController.release(entity?.id)
-            deletePicFile(localPath)
-//        }
+
+        }
     }
 
     override fun uploadCosCompleted(
@@ -157,7 +160,7 @@ class CosStatusController : CosStatusCallback {
                 trackUploadCos(5)
             }
         } else {
-            //上传图片成功, 如果是上报路况，直接上传，TODO
+            //上传图片成功, 如果是上报路况，直接上传
             Log.d(TAG, "uploadCosCompleted 分享成功 ---- mType = $mType")
             sendInformationDirectly(
                     INFO_TYPE_IMG,
@@ -213,6 +216,7 @@ class CosStatusController : CosStatusCallback {
             CosCallbackMapController.mainService?.let {
                 CosCallbackMapController.mainService?.sendCustomResult(success)
             }
+
         }
         }
     }

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

@@ -80,7 +80,7 @@ class MainService : Service() {
         Analytics.getInstance().start(this)
         //参数说明：appKey: app唯一标识（比如：包名）
         CosUploadManagerImpl.getInstance(AbsMogoApplication.getApp().applicationContext)
-                .init(BuildConfig.APPLICATION_ID, 2)
+                .init(BuildConfig.APPLICATION_ID, 0)
         //初始化语音
         VoiceController.initVoice()