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

OCH/mogo-och/src/main/java/com/mogo/och/BaseOchFragment.java

@@ -123,9 +123,9 @@ public abstract class BaseOchFragment<V extends IView, P extends Presenter<V>> e
                     RemoteControlAutoPilotParameters currentAutopilot = new RemoteControlAutoPilotParameters();
                     currentAutopilot.isSpeakVoice = true;
                     // 万集东门站
-                    currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(116.74157277,40.19885549);
+                    currentAutopilot.startLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.194795425,116.724476409);
                     // 市政府前街18号
-                    currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(116.729134342,40.1953113732);
+                    currentAutopilot.endLatLon = new RemoteControlAutoPilotParameters.AutoPilotLonLat(40.1939540844,116.720067);
                     // 订单运营类型 （9出租车，10小巴）
                     currentAutopilot.vehicleType = 10;
                     Logger.d(TAG, "模拟 订单站点下发：" + currentAutopilot);

app/build.gradle

@@ -56,6 +56,9 @@ android {
             shrinkResources false
             signingConfig signingConfigs.release
             proguardFiles getDefaultProguardFile('proguard-android-optimize.txt'), 'proguard-rules.pro'
+            manifestPlaceholders =[
+                    MAP_SDK_VERSION : properties.getProperty("MAP_SDK_VERSION")
+            ]
         }
     }
     compileOptions {

gradle.properties

@@ -187,4 +187,4 @@ applicationId=com.mogo.launcer
 applicationName=IntelligentPilot
 versionCode=80007
 versionName=8.0.7
-MAP_SDK_VERSION=1.0.0-vr-8.5.51
+MAP_SDK_VERSION=1.0.0-vr-8.5.52