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

modules/mogo-module-service/src/main/java/com/mogo/module/service/MarkerServiceHandler.java

@@ -63,8 +63,6 @@ public class MarkerServiceHandler {
     private static ICarsChattingProvider sCarChatting;
     private static IMogoGpsSimulatorManager sGpsSimulatorManager;
 
-    private static MapMarkerManager sMapMarkerManager;
-
     public static synchronized void init( final Context context ) {
 
         if ( sGpsSimulatorManager != null ) {
@@ -92,8 +90,7 @@ public class MarkerServiceHandler {
 
         sCarChatting = ( ICarsChattingProvider ) ARouter.getInstance().build( CallChattingProviderConstant.CAR_CALL_PROVIDER ).navigation( context );
 
-        sMapMarkerManager = MapMarkerManager.getInstance();
-        sMapMarkerManager.init( context );
+        MapMarkerManager.getInstance().init( context );
 
         sGpsSimulatorManager = ARouter.getInstance().navigation( IMogoGpsSimulatorManager.class );
     }
@@ -143,7 +140,7 @@ public class MarkerServiceHandler {
     }
 
     public static MapMarkerManager getMapMarkerManager() {
-        return sMapMarkerManager;
+        return MapMarkerManager.getInstance();
     }
 
     public static IMogoRegisterCenter getRegisterCenter() {

modules/mogo-module-service/src/main/java/com/mogo/module/service/MogoServices.java

@@ -741,6 +741,7 @@ public class MogoServices implements IMogoMapListener,
                         mIsFirstAccOn = false;
                         return;
                     }
+                    initLocationServiceProcess( mContext );
                     mADASController.showADAS();
                     MarkerServiceHandler.getApis().getMapServiceApi().getSingletonLocationClient( mContext ).start();
                     MarkerServiceHandler.getApis().getMapServiceApi().getMarkerManager( mContext ).removeMarkers();
@@ -787,6 +788,14 @@ public class MogoServices implements IMogoMapListener,
         restartAutoRefreshAtTime( time, true );
     }
 
+    public void clearAllData(){
+        try {
+            MarkerServiceHandler.getMapService().getMarkerManager( mContext ).removeMarkers();
+        } catch ( Exception e ) {
+            e.printStackTrace();
+        }
+    }
+
     private void restartAutoRefreshAtTime( long time, boolean stopOnlineCarRefresh ) {
         if ( time < 0 ) {
             Logger.w( TAG, "ignore refresh request case time < 0" );

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: {

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java

@@ -3,6 +3,8 @@ package com.mogo.module.service.marker;
 import android.content.Context;
 import android.graphics.Rect;
 import android.text.TextUtils;
+import android.view.animation.AccelerateInterpolator;
+import android.view.animation.LinearInterpolator;
 
 import com.mogo.commons.AbsMogoApplication;
 import com.mogo.commons.debug.DebugConfig;
@@ -11,6 +13,7 @@ import com.mogo.map.marker.IMogoMarker;
 import com.mogo.map.marker.IMogoMarkerClickListener;
 import com.mogo.map.marker.IMogoMarkerManager;
 import com.mogo.map.marker.MogoMarkerOptions;
+import com.mogo.map.marker.anim.OnMarkerAnimationListener;
 import com.mogo.module.common.ModuleNames;
 import com.mogo.module.common.entity.MarkerCarPois;
 import com.mogo.module.common.entity.MarkerCardResult;
@@ -34,6 +37,7 @@ import com.mogo.service.module.IMogoBizActionDoneListener;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.ThreadPoolService;
 import com.mogo.utils.UiThreadHandler;
+import com.mogo.utils.WorkThreadHandler;
 import com.mogo.utils.logger.Logger;
 
 import org.json.JSONArray;
@@ -373,15 +377,42 @@ public class MapMarkerManager implements IMogoMarkerClickListener,
                 IMogoMarker mogoMarker = existCarMap.get( sn );
                 if ( mogoMarker == null || mogoMarker.isDestroyed() ) {
                     Logger.d( TAG, "draw road condition, sn = %s", sn );
-                    mogoMarker = drawMapMarker( markerShowEntity, ServiceConst.MARKER_Z_INDEX_HIGH );
-                }
-                if ( mogoMarker != null ) {
-                    mogoMarker.setVisible( true );
+                    try {
+                        post2AddAndStartAnimation( markerShowEntity, i * 100L );
+                    } catch ( Exception e ) {
+                        e.printStackTrace();
+                    }
                 }
             }
         }
     }
 
+    private void post2AddAndStartAnimation( MarkerShowEntity entity, long delay ) {
+        if ( entity == null ) {
+            return;
+        }
+        WorkThreadHandler.getInstance().postDelayed( () -> {
+            if ( entity == null ) {
+                return;
+            }
+            IMogoMarker marker = drawMapMarker( entity, ServiceConst.MARKER_Z_INDEX_HIGH );
+            marker.startScaleAnimationWithAlpha( 0, 1.2f, 0, 1.2f, 0f, 1f,300, new LinearInterpolator(), new OnMarkerAnimationListener() {
+                @Override
+                public void onAnimStart() {
+                    Logger.d( TAG, " onAnimStart ---1----> " );
+                }
+
+                @Override
+                public void onAnimEnd() {
+                    if ( marker.isDestroyed() ) {
+                        return;
+                    }
+                    marker.startScaleAnimation( 1.2f, 1, 1.2f, 1, 100, new LinearInterpolator(), null );
+                }
+            } );
+        }, delay );
+    }
+
     /**
      * S =  (A ∩ B) ∪ B
      * （A ∩ B)作为旧列表需要保留的部分

modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/UserDataMarkerInfoWindowAdapter.java

@@ -54,6 +54,7 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
 
     private View mInfoWindowView = null;
 
+    private View mContentContainer;
     private MogoImageView mUserHeader;
     private TextView mContent;
     private TextView mTag;
@@ -92,12 +93,23 @@ public class UserDataMarkerInfoWindowAdapter implements IMogoInfoWindowAdapter {
 
         if ( mInfoWindowView == null ) {
             mInfoWindowView = LayoutInflater.from( mContext ).inflate( R.layout.view_map_data_user_info_window, null );
+            mContentContainer = mInfoWindowView.findViewById( R.id.module_service_id_marker_content );
             mUserHeader = mInfoWindowView.findViewById( R.id.module_service_id_user_header );
             mContent = mInfoWindowView.findViewById( R.id.module_service_id_content );
             mTag = mInfoWindowView.findViewById( R.id.module_service_id_tag );
             mCall = mInfoWindowView.findViewById( R.id.module_service_id_call );
         }
 
+        if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
+            mContentContainer.setPadding(
+                    mContentContainer.getPaddingLeft(),
+                    mContentContainer.getPaddingTop(),
+                    mContentContainer.getResources().getDimensionPixelSize( R.dimen.module_service_id_marker_content_paddingRight_widthoutCall ),
+                    mContentContainer.getPaddingBottom()
+            );
+            mCall.setVisibility( View.GONE );
+        }
+
         try {
             MarkerShowEntity markerShowEntity = ( MarkerShowEntity ) marker.getObject();
             mContent.setText( markerShowEntity.getTextContent() );

modules/mogo-module-service/src/main/java/com/mogo/module/service/strategy/MogoRefreshStrategyController.java

@@ -21,6 +21,11 @@ public class MogoRefreshStrategyController implements IMogoRefreshStrategyContro
         MogoServices.getInstance().restartAutoRefreshAtTime( delay );
     }
 
+    @Override
+    public void clearAllData() {
+        MogoServices.getInstance().clearAllData();
+    }
+
     @Override
     public void init( Context context ) {
 

modules/mogo-module-service/src/main/res/layout/view_map_data_user_info_window.xml

@@ -13,6 +13,7 @@
         android:id="@+id/module_service_id_marker_content"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/module_services_info_window_height"
+        android:paddingRight="@dimen/module_service_id_marker_content_paddingRight"
         android:background="@drawable/module_services_driver_blue_info"
         app:layout_constraintEnd_toEndOf="parent"
         app:layout_constraintStart_toStartOf="parent"
@@ -44,7 +45,7 @@
             app:layout_constraintStart_toEndOf="@+id/module_service_id_user_header"
             app:layout_constraintTop_toTopOf="@+id/module_service_id_user_header"
             app:layout_goneMarginRight="@dimen/dp_30"
-            tools:text="诗" />
+            tools:text="诗一样的远方的远方" />
 
         <TextView
             android:id="@+id/module_service_id_tag"
@@ -64,7 +65,6 @@
             android:layout_height="@dimen/module_service_user_header_height"
             android:layout_gravity="center"
             android:layout_marginLeft="@dimen/dp_10"
-            android:layout_marginRight="2.5px"
             android:scaleType="fitXY"
             android:src="@drawable/module_service_ic_call"
             app:layout_constraintBottom_toBottomOf="parent"

modules/mogo-module-service/src/main/res/values-xhdpi/dimens.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_service_marker_anchor_size">20dp</dimen>
-    <dimen name="module_service_marker_dot_marginTop">8dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
     <dimen name="module_service_marker_bubble_width">100px</dimen>
     <dimen name="module_service_marker_bubble_height">117px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">60px</dimen>
@@ -21,4 +21,5 @@
     <dimen name="module_service_content_textSize">24px</dimen>
     <dimen name="module_service_tag_textSize">20px</dimen>
     <dimen name="module_service_content_minWidth">120px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">20px</dimen>
 </resources>

modules/mogo-module-service/src/main/res/values/dimens.xml

@@ -1,7 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <resources>
     <dimen name="module_service_marker_anchor_size">16dp</dimen>
-    <dimen name="module_service_marker_dot_marginTop">4dp</dimen>
+    <dimen name="module_service_marker_dot_marginTop">2dp</dimen>
     <dimen name="module_service_marker_bubble_width">56px</dimen>
     <dimen name="module_service_marker_bubble_height">65px</dimen>
     <dimen name="module_service_marker_bubble_icon_width">35px</dimen>
@@ -20,4 +20,6 @@
     <dimen name="module_service_content_textSize">14px</dimen>
     <dimen name="module_service_tag_textSize">12px</dimen>
     <dimen name="module_service_content_minWidth">64px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight">6.5px</dimen>
+    <dimen name="module_service_id_marker_content_paddingRight_widthoutCall">10px</dimen>
 </resources>