Merge remote-tracking branch 'origin/qa_1.1.3' into qa_1.1.3

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

@@ -9,7 +9,6 @@ import com.mogo.utils.NetworkUtils
 import com.zhidao.auto.carcorder.callback.TakePhotoCallback
 import com.zhidao.auto.carcorder.callback.TakeVideoCallback
 import com.zhidao.auto.carcorder.controller.ZdCarCoderController
-import com.zhidao.roadcondition.BuildConfig
 import com.zhidao.roadcondition.constant.*
 import com.zhidao.roadcondition.event.GetImageSuccessEvent
 import com.zhidao.roadcondition.event.LatLngStickyEventBus
@@ -297,12 +296,6 @@ object CarCorderController : TakePhotoCallback, TakeVideoCallback {
                     getStrategyType("video")
             )
             var speed = LocationUtil.getInstance().getSpeed()
-            //TODO
-            if (BuildConfig.DEBUG) {
-                //获取视频以及缩略图成功,开始上报
-                compressVideo(videoPath, thumbnailPath, entity)
-                return
-            }
 
             if (entity?.isCustom) {
                 compressVideo(videoPath, thumbnailPath, entity)

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

@@ -31,8 +31,8 @@ fun getInformationBody(
     isShare:Boolean,
     poiType: String,
     mainInfoId: Long,
-    latitude: Double,
-    longitude: Double
+    longitude: Double,
+    latitude: Double
 ): InformationBody {
     var jsonArray = JsonArray()
     var type: Int

main-extensions/mogo-module-main-launcher/src/main/java/com/zhidao/mogo/module/main/launcher/MainLauncherActivity.java

@@ -20,7 +20,6 @@ import com.mogo.service.intent.IMogoIntentListener;
 public class MainLauncherActivity extends MainActivity implements IMogoIntentListener {
 
     protected boolean mIsHomeKeyDown = false;
-
     @Override
     protected void onCreate( @Nullable Bundle savedInstanceState ) {
         super.onCreate( savedInstanceState );