opt

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

@@ -127,8 +127,8 @@ public class AMapNaviViewWrapper implements IMogoMapView,
             options.setTrafficLayerEnabled( false );
             // 设置导航界面是否显示路线全览按钮。
             options.setRouteListButtonShow( false );
-            // 设置导航状态下屏幕是否一直开启。
-            options.setScreenAlwaysBright( true );
+            // 设置屏幕是否常亮，默认开启
+            options.setScreenAlwaysBright( false );
             // 设置交通播报是否打开（只适用于驾车导航，需要联网）。
             options.setTrafficInfoUpdateEnabled( true );
             // 设置摄像头播报是否打开（只适用于驾车导航）。

libraries/map-amap/src/main/java/com/mogo/map/impl/amap/marker/AMapMarkerWrapper.java

@@ -10,7 +10,9 @@ import com.amap.api.maps.model.BitmapDescriptorFactory;
 import com.amap.api.maps.model.LatLng;
 import com.amap.api.maps.model.Marker;
 import com.amap.api.maps.model.MarkerOptions;
+import com.amap.api.maps.model.animation.AlphaAnimation;
 import com.amap.api.maps.model.animation.Animation;
+import com.amap.api.maps.model.animation.AnimationSet;
 import com.amap.api.maps.model.animation.ScaleAnimation;
 import com.amap.api.maps.model.animation.TranslateAnimation;
 import com.amap.api.maps.utils.overlay.MovingPointOverlay;
@@ -382,6 +384,47 @@ public class AMapMarkerWrapper implements IMogoMarker, Observer {
         mMarker.startAnimation();
     }
 
+    @Override
+    public void startScaleAnimationWithAlpha( float fromX, float toX, float fromY, float toY, float fromAlpha, float toAlpha, int duration, Interpolator interpolator, OnMarkerAnimationListener listener ) {
+        if ( isDestroyed() ) {
+            return;
+        }
+
+        ScaleAnimation animationScale = new ScaleAnimation( fromX, toX, fromY, toY );
+        animationScale.setFillMode( Animation.FILL_MODE_FORWARDS );
+
+        AlphaAnimation alphaAnimation = new AlphaAnimation( fromAlpha, toAlpha );
+        alphaAnimation.setFillMode( Animation.FILL_MODE_FORWARDS );
+
+        AnimationSet animationSet = new AnimationSet( true );
+        animationSet.setDuration( duration );
+        animationSet.setInterpolator( interpolator);
+        animationSet.setAnimationListener( new Animation.AnimationListener() {
+            @Override
+            public void onAnimationStart() {
+                if ( isDestroyed() ) {
+                    return;
+                }
+                if ( listener != null ) {
+                    listener.onAnimStart();
+                }
+            }
+
+            @Override
+            public void onAnimationEnd() {
+                if ( isDestroyed() ) {
+                    return;
+                }
+                if ( listener != null ) {
+                    listener.onAnimEnd();
+                }
+            }
+        } );
+
+        mMarker.setAnimation( animationSet );
+        mMarker.startAnimation();
+    }
+
     @Override
     public void startJumpAnimation( float high, long duration, Interpolator interpolator, OnMarkerAnimationListener listener ) {
         if ( isDestroyed() || high <= 0.0f || interpolator == null || duration < 0 ) {

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() {
         };