Merge remote-tracking branch 'origin/qa_1.1.8' into dev

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

@@ -142,8 +142,8 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
             //地图上打点
             taskAsync(3_000) {
                 try {
-                    LatLngStickyEventBus.getInstance()
-                            .postSticky(GetImageSuccessEvent("", mType))
+//                    LatLngStickyEventBus.getInstance()
+//                            .postSticky(GetImageSuccessEvent("", mType))
                 } catch (e: java.lang.Exception) {
                     e.printStackTrace()
                 }

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

@@ -3,15 +3,13 @@ package com.zhidao.roadcondition.service
 import android.app.AlarmManager
 import android.app.PendingIntent
 import android.app.Service
-import android.content.BroadcastReceiver
-import android.content.Context
-import android.content.Intent
-import android.content.IntentFilter
+import android.content.*
 import android.os.IBinder
 import android.util.Log
 import com.alibaba.android.arouter.launcher.ARouter
 import com.elegant.analytics.Analytics
 import com.mogo.commons.AbsMogoApplication
+import com.mogo.module.common.MogoApisHandler
 import com.mogo.service.IMogoServiceApis
 import com.mogo.service.MogoServicePaths
 import com.mogo.utils.logger.Logger
@@ -189,6 +187,9 @@ class MainService : Service() {
                 "MainService",
                 "getImageEvent url = " + getImageSuccessEvent.getImageUrl() + ">>>>type =" + getImageSuccessEvent.getType()
         )
+
+        MogoApisHandler.getInstance().apis.statusManagerApi.setUploadingStatus("CARD_TYPE_ROAD_CONDITION", false)
+
 //        sendMarkerInfoReceiver(
 //                info.latitude,
 //                info.longitude,