Merge branch 'master' of gitlab.zhidaoauto.com:ecos/yycp-service/Launcher

# Conflicts:
#	gradle.properties
#	modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java
#	modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

libraries/map-amap/consumer-rules.pro

@@ -0,0 +1,5 @@
+#-----library-MapAMap-----
+-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;}
+-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status
+-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants
+-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum

libraries/map-amap/proguard-rules.pro

@@ -19,3 +19,9 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----library-MapAMap-----
+-keep class com.mogo.map.impl.amap.hook.BnHooker.*{*;}
+-keep class com.mogo.map.impl.amap.marker.CombineMovingPointOverlay.Status
+-keep class com.mogo.map.impl.amap.navi.PathPlanningErrorCodeConstants
+-keep class com.mogo.map.impl.amap.utils.MapStyleUtils.ColorEnum

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

@@ -321,6 +321,7 @@ public class AMapNaviViewWrapper implements IMogoMapView,
     @Override
     public void onNaviMapMode( int mode ) {
         Logger.i( TAG, "mode=" + mode );
+        MogoMapListenerHandler.getInstance().onMapModeChanged( mode == 0 ? EnumMapUI.CarUp_2D : EnumMapUI.NorthUP_2D );
     }
 
     @Override

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

libraries/mogo-map-api/consumer-rules.pro

@@ -0,0 +1,2 @@
+#-----library-MapApi----
+-keep class com.mogo.map.**{*;}

libraries/mogo-map-api/proguard-rules.pro

@@ -19,3 +19,6 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----library-MapApi----
+-keep class com.mogo.map.**{*;}

libraries/mogo-map-api/src/main/java/com/mogo/map/marker/IMogoMarker.java

@@ -267,9 +267,33 @@ public interface IMogoMarker {
                               Interpolator interpolator,
                               OnMarkerAnimationListener listener );
 
+    /**
+     * 缩放动画
+     *
+     * @param fromX
+     * @param toX
+     * @param fromY
+     * @param toY
+     * @param fromAlpha
+     * @param toAlpha
+     * @param duration
+     * @param interpolator
+     * @param listener
+     */
+    void startScaleAnimationWithAlpha( float fromX,
+                              float toX,
+                              float fromY,
+                              float toY,
+                              float fromAlpha,
+                              float toAlpha,
+                              int duration,
+                              Interpolator interpolator,
+                              OnMarkerAnimationListener listener );
+
 
     /**
      * 弹跳动画
+     *
      * @param high
      * @param duration
      * @param interpolator
@@ -278,7 +302,7 @@ public interface IMogoMarker {
     void startJumpAnimation( float high,
                              long duration,
                              Interpolator interpolator,
-                             OnMarkerAnimationListener listener);
+                             OnMarkerAnimationListener listener );
 
     /**
      * 是否是否可点击

libraries/mogo-map/consumer-rules.pro

@@ -0,0 +1,4 @@
+#-----MogoMap-----
+-keep class com.mogo.map.MogoNavi{
+   private <init>();
+}

libraries/mogo-map/proguard-rules.pro

@@ -19,3 +19,8 @@
 # If you keep the line number information, uncomment this to
 # hide the original source file name.
 #-renamesourcefileattribute SourceFile
+
+#-----MogoMap-----
+-keep class com.mogo.map.MogoNavi{
+   private <init>();
+}