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

app/build.gradle

@@ -82,8 +82,8 @@ android {
             applicationId rootProject.ext.android.independentApplicationId
             // 是否启动位置服务
             buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'false'
-            // 是否使用自定义导航
-            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'false'
+            // 是否使用高德sdk自定义导航
+            buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
             // 是否作为 launcher 运行
             buildConfigField 'boolean', 'IS_LAUNCHER', 'false'
         }
@@ -93,7 +93,7 @@ android {
             applicationId rootProject.ext.android.launcherApplicationId
             // 是否启动位置服务
             buildConfigField 'boolean', 'LAUNCH_LOCATION_SERVICE', 'true'
-            // 是否使用自定义导航
+            // 是否使用高德sdk自定义导航
             buildConfigField 'boolean', 'USE_CUSTOM_NAVI', 'true'
             // 是否作为 launcher 运行
             buildConfigField 'boolean', 'IS_LAUNCHER', 'true'

gradle.properties

@@ -69,7 +69,7 @@ MOGO_MODULE_GUIDESHOW_PROVIDER_VERSION=1.0.2-SNAPSHOT
 # 在线车辆F
 MOGO_MODULE_ONLINECAR_VERSION=1.0.3.2
 # v2x
-MOGO_MODULE_V2X_VERSION=1.2.8
+MOGO_MODULE_V2X_VERSION=1.2.9
 # 推送
 MOGO_MODULE_PUSH_VERSION=1.1.5.7
 MOGO_MODULE_PUSH_BASE_VERSION=1.1.5.5

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/AMapNaviListenerAdapter.java

@@ -66,7 +66,7 @@ public abstract class AMapNaviListenerAdapter implements AMapNaviListener {
     public void onGetNavigationText( String s ) {
         mLastSpeakWord = s;
         Logger.d( TAG, s );
-        TTSSpeaker.getInstance().speakTTS( s );
+//        TTSSpeaker.getInstance().speakTTS( s );
     }
 
     @Override

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/navi/NaviClient.java

@@ -11,6 +11,7 @@ import com.amap.api.navi.enums.AimLessMode;
 import com.amap.api.navi.enums.NaviType;
 import com.amap.api.navi.model.NaviLatLng;
 import com.mogo.commons.AbsMogoApplication;
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.commons.voice.AIAssist;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.impl.amap.AMapWrapper;
@@ -78,7 +79,7 @@ public class NaviClient implements IMogoNavi {
         mContext = context;
         mAMapNavi = AMapNavi.getInstance( context );
         mAMapNavi.setEmulatorNaviSpeed( 120 );
-        mAMapNavi.setUseInnerVoice( false, true );
+        mAMapNavi.setUseInnerVoice( DebugConfig.isUseCustomNavi(), true );
         mAMapNaviListener = new NaviListenerAdapter( context, mAMapNavi, this );
         mAimlessModeListener = new AimlessModeListenerAdapter() {
         };

modules/mogo-module-service/src/main/java/com/mogo/module/service/intent/MockIntentHandler.java

@@ -15,6 +15,9 @@ import com.mogo.commons.debug.DebugConfig;
 import com.mogo.map.MogoLatLng;
 import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.map.navi.IMogoNaviListener;
+import com.mogo.map.navi.MogoNaviInfo;
+import com.mogo.map.navi.MogoTraffic;
 import com.mogo.map.search.geo.IMogoGeoSearch;
 import com.mogo.map.search.geo.IMogoGeoSearchListener;
 import com.mogo.map.search.geo.MogoGeocodeResult;
@@ -154,6 +157,49 @@ public class MockIntentHandler implements IntentHandler {
             case 13: {
                 double lat = intent.getFloatExtra( "lat", 0.0f );
                 double lon = intent.getFloatExtra( "lon", 0.0f );
+                boolean real = intent.getBooleanExtra( "real", false );
+                MarkerServiceHandler.getRegisterCenter().registerMogoNaviListener( TAG, new IMogoNaviListener() {
+                    @Override
+                    public void onInitNaviFailure() {
+
+                    }
+
+                    @Override
+                    public void onInitNaviSuccess() {
+
+                    }
+
+                    @Override
+                    public void onNaviInfoUpdate( MogoNaviInfo naviinfo ) {
+
+                    }
+
+                    @Override
+                    public void onStartNavi() {
+
+                    }
+
+                    @Override
+                    public void onStopNavi() {
+
+                    }
+
+                    @Override
+                    public void onCalculateSuccess() {
+                        MarkerServiceHandler.getRegisterCenter().unregisterMogoNaviListener( TAG );
+                        MarkerServiceHandler.getNavi().startNavi( real );
+                    }
+
+                    @Override
+                    public void onoCalculateFailed() {
+
+                    }
+
+                    @Override
+                    public void onUpdateTraffic( MogoTraffic traffic ) {
+
+                    }
+                } );
                 MarkerServiceHandler.getNavi().naviTo( new MogoLatLng( lat, lon ) );
             }
             case 14: {