Merge branch 'dev' of http://gitlab.zhidaoauto.com/ecos/yycp-service/Launcher into dev

.idea/misc.xml

@@ -4,7 +4,7 @@
     <asm skipDebug="false" skipFrames="false" skipCode="false" expandFrames="false" />
     <groovy codeStyle="LEGACY" />
   </component>
-  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="JDK" project-jdk-type="JavaSDK">
+  <component name="ProjectRootManager" version="2" languageLevel="JDK_1_8" project-jdk-name="1.8" project-jdk-type="JavaSDK">
     <output url="file://$PROJECT_DIR$/build/classes" />
   </component>
 </project>

app/build.gradle

@@ -300,7 +300,7 @@ dependencies {
         releaseImplementation project(':modules:mogo-module-gps-simulator-noop')
         implementation project(':modules:mogo-module-media')
         implementation project(':modules:mogo-module-service')
-//        implementation project(':modules:mogo-module-splash')
+        implementation project(':modules:mogo-module-splash')
         // 事件面板分渠道引用
         d82xImplementation project(':modules:mogo-module-event-panel-noop')
         em1Implementation project(':modules:mogo-module-event-panel-noop')

gradle.properties

@@ -57,7 +57,7 @@ MOGO_MODULE_MAIN_INDEPENDENT_VERSION = 1.2.1.17
 
 ## 工程外部模块
 # 探路
-MOGO_MODULE_TANLU_VERSION=1.3.0.2
+MOGO_MODULE_TANLU_VERSION=1.3.0.3-byd
 # 车聊聊
 CARCHATTING_VERSION=1.3.2
 # 车聊聊接口
@@ -77,7 +77,7 @@ MOGO_MODULE_PUSH_NOOP_VERSION=1.1.5.5
 # 广告资源位
 MOGO_MODULE_AD_CARD_VERSION=1.0.1
 # 探路上报和分享模块
-TANLULIB_VERSION=1.3.0.2
+TANLULIB_VERSION=1.3.0.3-byd
 MOGO_MODULE_EVENT_PANEL_VERSION = 1.0.0-SNAPSHOT
 MOGO_MODULE_EVENT_PANEL_NOOP_VERSION = 1.0.0-SNAPSHOT
 #左侧面板模块

modules/mogo-module-common/src/main/java/com/mogo/module/common/dialog/BaseFloatDialog.java

@@ -6,6 +6,7 @@ import android.view.WindowManager;
 
 import androidx.annotation.NonNull;
 
+import com.mogo.commons.debug.DebugConfig;
 import com.mogo.module.common.R;
 
 /**
@@ -20,7 +21,9 @@ public class BaseFloatDialog extends Dialog {
 
     public BaseFloatDialog(@NonNull Context context, int themeResId) {
         super(context, themeResId);
-        addFlag();
+        if(DebugConfig.getCarMachineType() != DebugConfig.CAR_MACHINE_TYPE_BYD) {
+            addFlag();
+        }
     }
 
     private void addFlag() {

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java

@@ -6,7 +6,10 @@ import android.os.Bundle;
 import android.util.Log;
 import android.text.TextUtils;
 import android.util.TypedValue;
+import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
+import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -49,6 +52,7 @@ import com.mogo.service.module.IMogoRegisterCenter;
 import com.mogo.service.statusmanager.IMogoStatusChangedListener;
 import com.mogo.service.statusmanager.IMogoStatusManager;
 import com.mogo.service.statusmanager.StatusDescriptor;
+import com.mogo.service.windowview.IMogoTopViewStatusListener;
 import com.mogo.utils.LaunchUtils;
 import com.mogo.utils.ResourcesHelper;
 import com.mogo.utils.UiThreadHandler;
@@ -58,6 +62,7 @@ import com.zhidao.roadcondition.service.DelayService;
 
 import java.util.HashMap;
 import java.util.Map;
+import java.util.Random;
 
 
 /**
@@ -66,7 +71,7 @@ import java.util.Map;
  * <p>
  * 描述
  */
-public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresenter >
+public class EntranceFragment extends MvpFragment<EntranceView, EntrancePresenter>
         implements EntranceView,
         IMogoNaviListener,
         IMogoMapListener,
@@ -128,10 +133,10 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
     private Runnable mLockCarRunnable = new Runnable() {
         @Override
         public void run() {
-            if ( !mStatusManager.isDisplayOverview() ) {
+            if (!mStatusManager.isDisplayOverview()) {
                 return;
             }
-            mStatusManager.setDisplayOverview( TAG, false );
+            mStatusManager.setDisplayOverview(TAG, false);
             mMApUIController.recoverLockMode();
         }
     };
@@ -145,180 +150,186 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
 
     @Override
     protected void initViews() {
-        mApis = ( IMogoServiceApis ) ARouter.getInstance().build( MogoServicePaths.PATH_SERVICE_APIS ).navigation( getContext() );
+        mApis = (IMogoServiceApis) ARouter.getInstance().build(MogoServicePaths.PATH_SERVICE_APIS).navigation(getContext());
 
-        mEntrancePresenter = new EntrancePresenter( getContext(), this );
+        mEntrancePresenter = new EntrancePresenter(getContext(), this);
         mMogoFragmentManager = mApis.getFragmentManagerApi();
 
         mStatusManager = mApis.getStatusManagerApi();
 
-        mUploadRoadCondition = findViewById( R.id.module_entrance_id_upload_road_condition );
+        mUploadRoadCondition = findViewById(R.id.module_entrance_id_upload_road_condition);
-        mUpload = findViewById( R.id.module_entrance_id_upload );
+        mUpload = findViewById(R.id.module_entrance_id_upload);
-        mUploading = findViewById( R.id.module_entrance_id_uploading );
+        mUploading = findViewById(R.id.module_entrance_id_uploading);
-        mUploadRoadCondition.setOnClickListener( view -> {
+        mUploadRoadCondition.setOnClickListener(view -> {
             showShareDialog();
-        } );
+        });
 
-        mDisplayOverview = findViewById( R.id.module_ext_id_display_overview );
+        mDisplayOverview = findViewById(R.id.module_ext_id_display_overview);
-        mDisplayOverviewText = findViewById( R.id.module_ext_id_display_overview_text );
+        mDisplayOverviewText = findViewById(R.id.module_ext_id_display_overview_text);
-        mDisplayOverviewIcon = findViewById( R.id.module_ext_id_display_overview_icon );
+        mDisplayOverviewIcon = findViewById(R.id.module_ext_id_display_overview_icon);
-        mDisplayOverview.setOnClickListener( view -> {
+        mDisplayOverview.setOnClickListener(view -> {
-            if ( !mStatusManager.isDisplayOverview() ) {
+            if (!mStatusManager.isDisplayOverview()) {
-                mMApUIController.displayOverview( mDisplayOverviewBounds );
+                mMApUIController.displayOverview(mDisplayOverviewBounds);
-                UiThreadHandler.removeCallbacks( mLockCarRunnable );
+                UiThreadHandler.removeCallbacks(mLockCarRunnable);
-                UiThreadHandler.postDelayed( mLockCarRunnable, 20_000 );
+                UiThreadHandler.postDelayed(mLockCarRunnable, 20_000);
             } else {
                 mMApUIController.recoverLockMode();
-                UiThreadHandler.removeCallbacks( mLockCarRunnable );
+                UiThreadHandler.removeCallbacks(mLockCarRunnable);
             }
-            mStatusManager.setDisplayOverview( TAG, !mStatusManager.isDisplayOverview() );
+            mStatusManager.setDisplayOverview(TAG, !mStatusManager.isDisplayOverview());
-        } );
+        });
 
-        mMove2CurrentLocation = findViewById( R.id.module_entrance_id_move2_current_location );
+        mMove2CurrentLocation = findViewById(R.id.module_entrance_id_move2_current_location);
-        mMove2CurrentLocation.setOnClickListener( view -> {
+        mMove2CurrentLocation.setOnClickListener(view -> {
             final MogoLocation location = mMogoLocationClient.getLastKnowLocation();
-            if ( location != null ) {
+            if (location != null) {
-                if ( !mStatusManager.isV2XShow() ) {
+                if (!mStatusManager.isV2XShow()) {
-                    mStatusManager.setUserInteractionStatus( TAG, true, false );
+                    mStatusManager.setUserInteractionStatus(TAG, true, false);
-                    mMApUIController.setLockZoom( 16 );
+                    mMApUIController.setLockZoom(16);
-                    mMApUIController.changeZoom( 16.0f );
+                    mMApUIController.changeZoom(16.0f);
                 }
-                if ( mStatusManager.isDisplayOverview() ) {
+                if (mStatusManager.isDisplayOverview()) {
-                    mStatusManager.setDisplayOverview( TAG, false );
+                    mStatusManager.setDisplayOverview(TAG, false);
-                    UiThreadHandler.removeCallbacks( mLockCarRunnable );
+                    UiThreadHandler.removeCallbacks(mLockCarRunnable);
                 }
-                mStatusManager.setUserInteractionStatus( TAG, true, false );
+                mStatusManager.setUserInteractionStatus(TAG, true, false);
                 mMApUIController.recoverLockMode();
             }
-        } );
+        });
 
-        if ( DebugConfig.isDebug() ) {
+        if (DebugConfig.isDebug()) {
-            mMove2CurrentLocation.setOnLongClickListener( view -> {
+            mMove2CurrentLocation.setOnLongClickListener(view -> {
                 mApis.getSearchManagerApi().goSettings();
                 return true;
-            } );
+            });
         }
 
-        ConstraintLayout rootView = findViewById( R.id.module_entrance_id_top_motion_layout );
+        ConstraintLayout rootView = findViewById(R.id.module_entrance_id_top_motion_layout);
-        if ( rootView != null ) {
+        if (rootView != null) {
-            TopViewAnimHelper.getInstance().init( rootView );
+            TopViewAnimHelper.getInstance().init(rootView);
         }
 
-        mExitNavi = findViewById( R.id.module_entrance_id_exit_navi );
+        mExitNavi = findViewById(R.id.module_entrance_id_exit_navi);
-        mExitNavi.setOnClickListener( view -> {
+        mExitNavi.setOnClickListener(view -> {
-            if ( mMogoNavi != null ) {
+            if (mMogoNavi != null) {
-                if ( mIsLock ) {
+                if (mIsLock) {
-                    new WMDialog.Builder( getContext() )
+                    new WMDialog.Builder(getContext())
-                            .setOkButton( R.string.module_commons_button_ok, ( dlg, which ) -> {
+                            .setOkButton(R.string.module_commons_button_ok, (dlg, which) -> {
                                 dlg.dismiss();
                                 mMogoNavi.stopNavi();
-                            } )
+                            })
-                            .setCancelButton( R.string.module_commons_button_cancel,
+                            .setCancelButton(R.string.module_commons_button_cancel,
-                                    ( dlg, which ) -> {
+                                    (dlg, which) -> {
                                         dlg.dismiss();
-                                    } )
+                                    })
-                            .setContent( R.string.module_commons_exit_navi_content )
+                            .setContent(R.string.module_commons_exit_navi_content)
                             .build()
                             .show();
                 } else {
-                    MapCenterPointStrategy.setMapCenterPointByScene( mMApUIController, Scene.NAVI );
+                    MapCenterPointStrategy.setMapCenterPointByScene(mMApUIController, Scene.NAVI);
                     mMApUIController.recoverLockMode();
                 }
             }
-        } );
+        });
 
-        mCameraMode = findViewById( R.id.module_ext_id_north );
+        mCameraMode = findViewById(R.id.module_ext_id_north);
-        mCameraMode.setOnClickListener( view -> {
+        mCameraMode.setOnClickListener(view -> {
-            if ( mCameraMode.isSelected() ) {
+            if (mCameraMode.isSelected()) {
-                mMApUIController.changeMapMode( EnumMapUI.CarUp_2D );
+                mMApUIController.changeMapMode(EnumMapUI.CarUp_2D);
             } else {
-                mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
+                mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
             }
-            mCameraMode.setSelected( !mCameraMode.isSelected() );
+            mCameraMode.setSelected(!mCameraMode.isSelected());
-            mCameraMode.setText( getString( mCameraMode.isSelected() ? R.string.mode_car_up :
+            mCameraMode.setText(getString(mCameraMode.isSelected() ? R.string.mode_car_up :
-                    R.string.mode_north_up ) );
+                    R.string.mode_north_up));
-        } );
+        });
 
 
-        mApis.getIntentManagerApi().registerIntentListener( AUTONAVI_STANDARD_BROADCAST_RECV,
+        mApis.getIntentManagerApi().registerIntentListener(AUTONAVI_STANDARD_BROADCAST_RECV,
                 new IMogoIntentListener() {
                     @Override
-                    public void onIntentReceived( String intentStr, Intent intent ) {
+                    public void onIntentReceived(String intentStr, Intent intent) {
-                        int key_type = intent.getIntExtra( "KEY_TYPE", 0 );
+                        int key_type = intent.getIntExtra("KEY_TYPE", 0);
-                        int type = intent.getIntExtra( "EXTRA_TYPE", -1 );
+                        int type = intent.getIntExtra("EXTRA_TYPE", -1);
-                        int opera_type = intent.getIntExtra( "EXTRA_OPERA", -1 );
+                        int opera_type = intent.getIntExtra("EXTRA_OPERA", -1);
-                        if ( key_type == 10027 ) {
+                        if (key_type == 10027) {
-                            if ( opera_type == 0 ) {
+                            if (opera_type == 0) {
-                                mCameraMode.setSelected( false );
+                                mCameraMode.setSelected(false);
-                            } else if ( opera_type == 1 ) {
+                            } else if (opera_type == 1) {
-                                mCameraMode.setSelected( true );
+                                mCameraMode.setSelected(true);
                             }
-                            mCameraMode.setText( getString( mCameraMode.isSelected() ?
+                            mCameraMode.setText(getString(mCameraMode.isSelected() ?
-                                    R.string.mode_car_up : R.string.mode_north_up ) );
+                                    R.string.mode_car_up : R.string.mode_north_up));
                         }
                     }
-                } );
+                });
-        MogoEntranceButtons.save( ButtonIndex.BUTTON1, findViewById( R.id.module_entrance_id_button1 ) );
+        MogoEntranceButtons.save(ButtonIndex.BUTTON1,
-        MogoEntranceButtons.save( ButtonIndex.BUTTON2, findViewById( R.id.module_entrance_id_button2 ) );
+                findViewById(R.id.module_entrance_id_button1));
+        MogoEntranceButtons.save(ButtonIndex.BUTTON2,
+                findViewById(R.id.module_entrance_id_button2));
 
         mDisplayOverviewBounds = new Rect(
-                ResourcesHelper.getDimensionPixelSize( getContext(),
+                ResourcesHelper.getDimensionPixelSize(getContext(),
-                        R.dimen.module_map_display_overview_left_margin ),
+                        R.dimen.module_map_display_overview_left_margin),
-                ResourcesHelper.getDimensionPixelSize( getContext(),
+                ResourcesHelper.getDimensionPixelSize(getContext(),
-                        R.dimen.module_map_display_overview_top_margin ),
+                        R.dimen.module_map_display_overview_top_margin),
-                ResourcesHelper.getDimensionPixelSize( getContext(),
+                ResourcesHelper.getDimensionPixelSize(getContext(),
-                        R.dimen.module_map_display_overview_right_margin ),
+                        R.dimen.module_map_display_overview_right_margin),
-                ResourcesHelper.getDimensionPixelSize( getContext(),
+                ResourcesHelper.getDimensionPixelSize(getContext(),
-                        R.dimen.module_map_display_overview_bottom_margin )
+                        R.dimen.module_map_display_overview_bottom_margin)
         );
 
         mNaviInfo = new NaviInfoView();
-        mNaviInfo.inflate( rootView );
+        mNaviInfo.inflate(rootView);
 
-        findViewById( R.id.module_map_id_navi_bg ).setOnClickListener( view -> {
+        findViewById(R.id.module_map_id_navi_bg).setOnClickListener(view -> {
             try {
-                LaunchUtils.launchByPkg( getContext(), "com.autonavi.amapauto" );
+                LaunchUtils.launchByPkg(getContext(), "com.autonavi.amapauto");
-            } catch ( Exception e ) {
+            } catch (Exception e) {
                 e.printStackTrace();
             }
-        } );
+        });
 
-        mWeatherContainer = findViewById( R.id.module_ext_id_weather_container );
+        mWeatherContainer = findViewById(R.id.module_ext_id_weather_container);
-        mWeatherIcon = findViewById( R.id.module_ext_id_weather_icon );
+        mWeatherIcon = findViewById(R.id.module_ext_id_weather_icon);
-        mWeatherTemp = findViewById( R.id.module_ext_id_weather_temp );
+        mWeatherTemp = findViewById(R.id.module_ext_id_weather_temp);
 
-        mUserHeadImg = findViewById( R.id.ivUserHeadImg );
+        mUserHeadImg = findViewById(R.id.ivUserHeadImg);
 
-        mMsgContainer = findViewById( R.id.module_ext_id_msg );
+        mMsgContainer = findViewById(R.id.module_ext_id_msg);
 
-        mMsgContainer.setOnClickListener( view -> {
+        mMsgContainer.setOnClickListener(view -> {
-            ARouter.getInstance().build( "/push/ui/message" ).navigation( getContext() );
+            ARouter.getInstance().build("/push/ui/message").navigation(getContext());
-        } );
+        });
-        mMsgCounter = findViewById( R.id.module_ext_id_msg_counter );
+        mMsgCounter = findViewById(R.id.module_ext_id_msg_counter);
-        mUserHeadImg.setOnClickListener( view -> {
+        mUserHeadImg.setOnClickListener(view -> {
             // todo 测试代码
 //            mApis.getEventPanelManager().showPanel();
             // 原始逻辑
             try {
-                LaunchUtils.launchByPkg( getContext(), "com.zhidao.auto.personal" );
+                LaunchUtils.launchByPkg(getContext(), "com.zhidao.auto.personal");
                 // 埋点
-                final Map< String, Object > properties = new HashMap<>();
+                final Map<String, Object> properties = new HashMap<>();
-                properties.put( "type", 3 );
+                properties.put("type", 3);
-                ServiceApisManager.serviceApis.getAnalyticsApi().track( "Launcher_APP_Icon", properties );
+                ServiceApisManager.serviceApis.getAnalyticsApi().track("Launcher_APP_Icon",
-            } catch ( Exception e ) {
+                        properties);
-                Logger.e( TAG, e, "打开个人中心Exception" );
+            } catch (Exception e) {
+                Logger.e(TAG, e, "打开个人中心Exception");
             }
-        } );
+        });
 
-        mUserHeadImg.setVisibility( DebugConfig.isLauncher() ? View.VISIBLE : View.GONE );
+        mUserHeadImg.setVisibility(DebugConfig.isLauncher() ? View.VISIBLE : View.GONE);
 
-        mUploadButtonAnimatorController = new UploadButtonAnimatorController( mUploading, mUpload, mStatusManager );
+        mUploadButtonAnimatorController = new UploadButtonAnimatorController(mUploading, mUpload,
+                mStatusManager);
+
+        debugTopView();
     }
 
     public void showShareDialog() {
         isClickShare = true;
         mApis.getShareManager().showShareDialog();
-        traceData( "1" );
+        traceData("1");
     }
 
     private static final String AUTONAVI_STANDARD_BROADCAST_RECV =
@@ -331,25 +342,25 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
     }
 
     @Override
-    public void onActivityCreated( @Nullable Bundle savedInstanceState ) {
+    public void onActivityCreated(@Nullable Bundle savedInstanceState) {
-        super.onActivityCreated( savedInstanceState );
+        super.onActivityCreated(savedInstanceState);
         mService = mApis.getMapServiceApi();
         mMogoRegisterCenter = mApis.getRegisterCenterApi();
         mMApUIController = mService.getMapUIController();
-        mMogoLocationClient = mService.getSingletonLocationClient( getContext() );
+        mMogoLocationClient = mService.getSingletonLocationClient(getContext());
-        mMogoNavi = mService.getNavi( getContext() );
+        mMogoNavi = mService.getNavi(getContext());
         mAnalytics = mApis.getAnalyticsApi();
 
-        mMogoRegisterCenter.registerMogoNaviListener( ExtensionsModuleConst.TYPE_ENTRANCE, this );
+        mMogoRegisterCenter.registerMogoNaviListener(ExtensionsModuleConst.TYPE_ENTRANCE, this);
-        mMogoRegisterCenter.registerMogoMapListener( ExtensionsModuleConst.TYPE_ENTRANCE, this );
+        mMogoRegisterCenter.registerMogoMapListener(ExtensionsModuleConst.TYPE_ENTRANCE, this);
-        mMogoRegisterCenter.registerMogoAimlessModeListener( TAG, this );
+        mMogoRegisterCenter.registerMogoAimlessModeListener(TAG, this);
 
-        mMogoMarkerManager = mService.getMarkerManager( getContext() );
+        mMogoMarkerManager = mService.getMarkerManager(getContext());
 
-        mStatusManager.registerStatusChangedListener( TAG, StatusDescriptor.UPLOADING, this );
+        mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.UPLOADING, this);
-        mStatusManager.registerStatusChangedListener( TAG, StatusDescriptor.DISPLAY_OVERVIEW, this );
+        mStatusManager.registerStatusChangedListener(TAG, StatusDescriptor.DISPLAY_OVERVIEW, this);
 
-        TopViewAnimHelper.getInstance().setIMogoMapUIController( mMApUIController );
+        TopViewAnimHelper.getInstance().setIMogoMapUIController(mMApUIController);
     }
 
     @Override
@@ -359,147 +370,219 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent
     }
 
     @Override
-    public void onNaviInfoUpdate( MogoNaviInfo naviinfo ) {
+    public void onNaviInfoUpdate(MogoNaviInfo naviinfo) {
-        if ( naviinfo == null ) {
+        if (naviinfo == null) {
             return;
         }
-        if ( mNaviInfo != null ) {
+        if (mNaviInfo != null) {
-            if ( !mNaviInfo.isVisible() ) {
+            if (!mNaviInfo.isVisible()) {
                 // 避免导航先开启，再开启app的情况
                 onStartNavi();
             }
-            mNaviInfo.notifyChanged( naviinfo );
+            mNaviInfo.notifyChanged(naviinfo);
         }
     }
 
     @Override
     public void onStartNavi() {
         TopViewAnimHelper.getInstance().showNaviView();
-        mMApUIController.changeMapMode( mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D :
+        mMApUIController.changeMapMode(mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D :
-                EnumMapUI.CarUp_2D );
+                EnumMapUI.CarUp_2D);
-        MapCenterPointStrategy.setMapCenterPointBySceneAndDelay( mMApUIController, Scene.NAVI, 500
+        MapCenterPointStrategy.setMapCenterPointBySceneAndDelay(mMApUIController, Scene.NAVI, 500
                 , () -> {
                     return !mMogoNavi.isNaviing();
-                } );
+                });
-        if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+        if (CustomNaviInterrupter.getInstance().interrupt()) {
-            mDisplayOverview.setVisibility( View.GONE );
+            mDisplayOverview.setVisibility(View.GONE);
-            mCameraMode.setVisibility( View.GONE );
+            mCameraMode.setVisibility(View.GONE);
-            mExitNavi.setVisibility( View.GONE );
+            mExitNavi.setVisibility(View.GONE);
         } else {
-            mExitNavi.setVisibility( View.VISIBLE );
+            mExitNavi.setVisibility(View.VISIBLE);
-            mDisplayOverview.setVisibility( View.VISIBLE );
+            mDisplayOverview.setVisibility(View.VISIBLE);
-            mCameraMode.setVisibility( View.VISIBLE );
+            mCameraMode.setVisibility(View.VISIBLE);
         }
-        mApis.getAnalyticsApi().track( "Navigation_begin", new HashMap<>() );
+        mApis.getAnalyticsApi().track("Navigation_begin", new HashMap<>());
     }
 
     @Override
     public void onStopNavi() {
         TopViewAnimHelper.getInstance().hideNaviView();
-        mExitNavi.setVisibility( View.GONE );
+        mExitNavi.setVisibility(View.GONE);
-        mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D );
+        mMApUIController.changeMapMode(EnumMapUI.NorthUP_2D);
-        mDisplayOverview.setVisibility( View.GONE );
+        mDisplayOverview.setVisibility(View.GONE);
-        mCameraMode.setVisibility( View.GONE );
+        mCameraMode.setVisibility(View.GONE);
-        MapCenterPointStrategy.setMapCenterPointByScene( mMApUIController, Scene.AIMLESS );
+        MapCenterPointStrategy.setMapCenterPointByScene(mMApUIController, Scene.AIMLESS);
     }
 
     @Override
-    public void onUpdateTraffic2( MogoTraffic traffic ) {
+    public void onUpdateTraffic2(MogoTraffic traffic) {
-        if ( traffic == null ) {
+        if (traffic == null) {
             return;
         }
     }
 
     @Override
-    public void onLockMap( boolean isLock ) {
+    public void onLockMap(boolean isLock) {
         mIsLock = isLock;
-        if ( isLock ) {
+        if (isLock) {
-            mExitNavi.setText( R.string.module_ext_str_exit_navi );
+            mExitNavi.setText(R.string.module_ext_str_exit_navi);
-            if ( mStatusManager.isDisplayOverview() ) {
+            if (mStatusManager.isDisplayOverview()) {
-                mStatusManager.setDisplayOverview( TAG, false );
+                mStatusManager.setDisplayOverview(TAG, false);
             }
         } else {
-            mExitNavi.setText( R.string.module_ext_str_continue_navi );
+            mExitNavi.setText(R.string.module_ext_str_continue_navi);
         }
     }
 
-    private void traceData( String from ) {
+    private void traceData(String from) {
-        Map< String, Object > properties = new HashMap<>();
+        Map<String, Object> properties = new HashMap<>();
-        properties.put( "from", from );
+        properties.put("from", from);
-        mAnalytics.track( "v2x_share_click", properties );
+        mAnalytics.track("v2x_share_click", properties);
     }
 
     @Override
-    public void onStatusChanged( StatusDescriptor descriptor, boolean isTrue ) {
+    public void onStatusChanged(StatusDescriptor descriptor, boolean isTrue) {
-        if ( mUploadRoadCondition == null ) {
+        if (mUploadRoadCondition == null) {
             return;
         }
 
-        if ( descriptor == StatusDescriptor.UPLOADING ) {
+        if (descriptor == StatusDescriptor.UPLOADING) {
-            if ( isTrue ) {
+            if (isTrue) {
-                mUploading.setVisibility( View.VISIBLE );
+                mUploading.setVisibility(View.VISIBLE);
-                mUpload.setVisibility( View.GONE );
+                mUpload.setVisibility(View.GONE);
                 mUploadButtonAnimatorController.doFrameAnimOnUploadButton();
             } else {
                 mUploadButtonAnimatorController.stopAnimation();
-                mUploading.setVisibility( View.GONE );
+                mUploading.setVisibility(View.GONE);
-                mUpload.setVisibility( View.VISIBLE );
+                mUpload.setVisibility(View.VISIBLE);
             }
-        } else if ( descriptor == StatusDescriptor.DISPLAY_OVERVIEW ) {
+        } else if (descriptor == StatusDescriptor.DISPLAY_OVERVIEW) {
-            if ( !mMogoNavi.isNaviing() ) {
+            if (!mMogoNavi.isNaviing()) {
                 return;
             }
-            if ( isTrue ) {
+            if (isTrue) {
-                mDisplayOverviewText.setText( "退出全览" );
+                mDisplayOverviewText.setText("退出全览");
-                mDisplayOverviewText.setTextSize( TypedValue.COMPLEX_UNIT_PX,
+                mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                        getResources().getDimensionPixelSize( R.dimen.module_ext_display_overview_textSize ) );
+                        getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize));
-                mCameraMode.setVisibility( View.GONE );
+                mCameraMode.setVisibility(View.GONE);
             } else {
-                mDisplayOverviewText.setText( "全览" );
+                mDisplayOverviewText.setText("全览");
-                mDisplayOverviewText.setTextSize( TypedValue.COMPLEX_UNIT_PX,
+                mDisplayOverviewText.setTextSize(TypedValue.COMPLEX_UNIT_PX,
-                        getResources().getDimensionPixelSize( R.dimen.module_ext_display_overview_textSize_large ) );
+                        getResources().getDimensionPixelSize(R.dimen.module_ext_display_overview_textSize_large));
-                if ( CustomNaviInterrupter.getInstance().interrupt() ) {
+                if (CustomNaviInterrupter.getInstance().interrupt()) {
-                    mCameraMode.setVisibility( View.GONE );
+                    mCameraMode.setVisibility(View.GONE);
                 } else {
-                    mCameraMode.setVisibility( View.VISIBLE );
+                    mCameraMode.setVisibility(View.VISIBLE);
                 }
             }
-        } else if ( descriptor == StatusDescriptor.ACC_STATUS ) {
+        } else if (descriptor == StatusDescriptor.ACC_STATUS) {
-            Log.d( TAG, " onStatusChanged  isTrue = " + isTrue );
+            Log.d(TAG, " onStatusChanged  isTrue = " + isTrue);
-            if ( isTrue ) {
+            if (isTrue) {
-                DelayService.Companion.launchService( getContext() );
+                DelayService.Companion.launchService(getContext());
             }
         }
     }
 
 
     @Override
-    public void renderWeatherInfo( String temp, String desc, int iconId ) {
+    public void renderWeatherInfo(String temp, String desc, int iconId) {
         boolean hidden = false;
-        if ( iconId != 0 ) {
+        if (iconId != 0) {
-            mWeatherIcon.setImageResource( iconId );
+            mWeatherIcon.setImageResource(iconId);
-            mWeatherIcon.setVisibility( View.VISIBLE );
+            mWeatherIcon.setVisibility(View.VISIBLE);
         } else {
-            mWeatherIcon.setVisibility( View.GONE );
+            mWeatherIcon.setVisibility(View.GONE);
             hidden |= true;
         }
-        hidden |= TextUtils.isEmpty( temp );
+        hidden |= TextUtils.isEmpty(temp);
-        hidden |= TextUtils.isEmpty( desc );
+        hidden |= TextUtils.isEmpty(desc);
-        mWeatherTemp.setText( temp );
+        mWeatherTemp.setText(temp);
-        mWeatherContainer.setVisibility( hidden ? View.INVISIBLE : View.VISIBLE );
+        mWeatherContainer.setVisibility(hidden ? View.INVISIBLE : View.VISIBLE);
     }
 
     @Override
-    public void renderMsgInfo( boolean hasMsg, int amount ) {
+    public void renderMsgInfo(boolean hasMsg, int amount) {
-        mMsgContainer.setVisibility( hasMsg ? View.VISIBLE : View.GONE );
+        mMsgContainer.setVisibility(hasMsg ? View.VISIBLE : View.GONE);
-        mMsgCounter.setText( amount > MAX_DISPLAY_MSG_AMOUNT ? getString( R.string.module_ext_str_dots ) : String.valueOf( amount ) );
+        mMsgCounter.setText(amount > MAX_DISPLAY_MSG_AMOUNT ?
+                getString(R.string.module_ext_str_dots) : String.valueOf(amount));
     }
 
     @Override
-    public void renderUserInfo( UserInfo userInfo ) {
+    public void renderUserInfo(UserInfo userInfo) {
-        if ( userInfo != null ) {
+        if (userInfo != null) {
-            Logger.d( TAG, "renderUserInfo: " + userInfo );
+            Logger.d(TAG, "renderUserInfo: " + userInfo);
-            GlideApp.with( getContext() ).load( userInfo.getHeadImgurl() ).placeholder( R.drawable.model_ext_default_user_head ).circleCrop().into( mUserHeadImg );
+            GlideApp.with(getContext()).load(userInfo.getHeadImgurl()).placeholder(R.drawable.model_ext_default_user_head).circleCrop().into(mUserHeadImg);
         }
     }
+
+    private int[] heights = new int[]{100,200,300};
+    private int currentHeight;
+    private void debugTopView() {
+        findViewById(R.id.btnDebugCtrlNaviView).setOnClickListener(view -> {
+            if (!toggle) {
+                TopViewAnimHelper.getInstance().showNaviView();
+            } else {
+                TopViewAnimHelper.getInstance().hideNaviView();
+            }
+            toggle = !toggle;
+        });
+
+        findViewById(R.id.btnDebugCtrlSubView).setOnClickListener(view -> {
+            View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
+            TextView tv = v.findViewById(R.id.tvIndex);
+            tv.setText("sub view  height: " + currentHeight + ": " + v);
+            mApis.getTopViewManager().addSubView(v, new IMogoTopViewStatusListener() {
+                @Override
+                public void onViewAdded(View view) {
+                    Logger.d(TAG, "onSubViewAdded: " + view);
+                }
+
+                @Override
+                public void onViewRemoved(View view) {
+                    Logger.d(TAG, "onSubViewRemoved: " + view);
+                }
+
+                @Override
+                public void beforeViewAddAnim(View view) {
+                    Logger.d(TAG, "beforeSubViewAddAnim: " + view);
+                }
+
+                @Override
+                public void beforeViewRemoveAnim(View view) {
+                    Logger.d(TAG, "beforeSubViewRemoveAnim: " + view);
+                }
+            });
+        });
+
+        findViewById(R.id.btnDebugCtrlTopView).setOnClickListener(view -> {
+            View v = LayoutInflater.from(getContext()).inflate(R.layout.demo_top, null);
+            TextView tv = v.findViewById(R.id.tvIndex);
+            Random random = new Random();
+            currentHeight = heights[random.nextInt(3)];
+            tv.setText("  height: " + currentHeight + ": " + v);
+            ViewGroup.LayoutParams params =
+                    new ViewGroup.LayoutParams(ViewGroup.LayoutParams.MATCH_PARENT, currentHeight);
+            mApis.getTopViewManager().addView(v, params, new IMogoTopViewStatusListener() {
+                @Override
+                public void onViewAdded(View view) {
+                    Logger.d(TAG, "onViewAdded: " + view);
+                }
+
+                @Override
+                public void onViewRemoved(View view) {
+                    Logger.d(TAG, "onViewRemoved: " + view);
+                }
+
+                @Override
+                public void beforeViewAddAnim(View view) {
+                    Logger.d(TAG, "beforeViewAddAnim: " + view);
+                }
+
+                @Override
+                public void beforeViewRemoveAnim(View view) {
+                    Logger.d(TAG, "beforeViewRemoveAnim: " + view);
+                }
+            });
+        });
+    }
 }

modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/TopViewAnimHelper.java

@@ -9,8 +9,6 @@ import android.util.ArrayMap;
 import android.view.View;
 import android.view.ViewGroup;
 import android.view.ViewGroup.LayoutParams;
-import android.view.animation.BounceInterpolator;
-import android.view.animation.OvershootInterpolator;
 import android.widget.ImageView;
 import android.widget.TextView;
 
@@ -21,7 +19,6 @@ import androidx.constraintlayout.widget.Group;
 import com.mogo.map.uicontroller.IMogoMapUIController;
 import com.mogo.module.common.map.MapCenterPointStrategy;
 import com.mogo.module.common.map.Scene;
-import com.mogo.module.common.utils.CarSeries;
 import com.mogo.module.extensions.R;
 import com.mogo.module.extensions.navi.TopView;
 import com.mogo.service.windowview.IMogoTopViewStatusListener;
@@ -662,7 +659,7 @@ public class TopViewAnimHelper {
     }
 
     private int computeNaviMarginTop(int height) {
-        int result = (int) (height - (getDimen(R.dimen.dp_350) - getDimen(R.dimen.dp_316)));
+        int result = (int) (height - (getDimen(R.dimen.module_ext_top_over_navi_height)));
         Logger.d(TAG, "computeNaviMarginTop: " + height + "  result: " + result);
         return result;
     }

modules/mogo-module-extensions/src/main/res/layout-xhdpi-1920x1000/include_navi_info_panle.xml

@@ -0,0 +1,229 @@
+<?xml version="1.0" encoding="utf-8"?>
+<merge xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
+    tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout">
+    <View
+        android:id="@+id/module_map_id_navi_bg"
+        android:layout_width="match_parent"
+        android:layout_height="@dimen/module_ext_navi_info_panel_height"
+        android:background="@drawable/module_ext_dw_navi_info_panel_bkg"
+        android:focusable="true"
+        android:clickable="true"
+        app:layout_constraintHorizontal_bias="0.501"
+        app:layout_constraintLeft_toLeftOf="@id/module_entrance_id_top_container"
+        app:layout_constraintRight_toRightOf="@id/module_entrance_id_top_container"
+        app:layout_constraintTop_toTopOf="@id/module_entrance_id_top_motion_layout" />
+
+    <ImageView
+        android:id="@+id/module_map_id_navi_next_info_road_turn_icon"
+        android:layout_width="@dimen/module_ext_navi_info_panel_turn_icon_width"
+        android:layout_height="@dimen/module_ext_navi_info_panel_turn_icon_height"
+        android:layout_marginStart="@dimen/module_ext_navi_info_panel_turn_icon_marginLeft"
+        android:scaleType="fitCenter"
+        android:src="@drawable/ic_11"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
+        app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg"
+        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_bg" />
+
+    <TextView
+        android:id="@+id/module_map_id_navi_next_info_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/module_map_id_navi_next_info_distance_marginStart"
+        android:layout_marginTop="@dimen/module_map_id_navi_next_info_distance_marginTop"
+        android:text="53"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_textSize"
+        android:textStyle="bold"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_road_turn_icon"
+        app:layout_constraintTop_toTopOf="@+id/module_map_id_navi_next_info_road_turn_icon" />
+
+    <TextView
+        android:id="@+id/module_map_id_navi_next_info_distance_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
+        android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
+        android:text="米"
+        android:textColor="#FFFFFF"
+        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize"
+        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance" />
+
+    <TextView
+        android:id="@+id/module_map_id_navi_next_info_turn_info"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginLeft"
+        android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom"
+        android:textColor="#7FF1F1F1"
+        android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_next_step_textSize"
+        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_navi_next_info_distance_unit"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_navi_next_info_distance_unit" />
+
+    <TextView
+        android:id="@+id/module_map_id_navi_next_info_road"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginTop="@dimen/module_ext_navi_next_info_road_marginTop"
+        android:layout_marginBottom="@dimen/module_map_id_navi_next_info_road_marginBottom"
+        android:ellipsize="end"
+        android:maxLines="1"
+        android:text="北三环东路辅路"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_navi_info_panel_next_info_road_textSize"
+        android:textStyle="bold"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_next_info_road_turn_icon"
+        app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_next_info_distance" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/remainDistanceGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="module_map_id_remaining_distance_icon,module_map_id_remaining_distance,module_map_id_remaining_distance_unit,module_map_id_remaining_distance_notice" />
+    <!--remain distance-->
+
+    <TextView
+        android:id="@+id/module_map_id_remaining_distance"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:layout_marginStart="@dimen/dp_657"
+        app:layout_constraintLeft_toLeftOf="@id/module_map_id_navi_bg"
+        android:text="3599"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_remaining_distance_textSize"
+        android:textStyle="bold"
+        app:layout_constraintHorizontal_chainStyle="spread_inside"
+        app:layout_constraintBottom_toTopOf="@+id/module_map_id_remaining_distance_notice"
+        app:layout_constraintRight_toLeftOf="@+id/module_map_id_remaining_time"
+        app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
+        app:layout_constraintVertical_chainStyle="packed"/>
+
+    <TextView
+        android:id="@+id/module_map_id_remaining_distance_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="km"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
+        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_distance"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance" />
+
+    <ImageView
+        android:id="@+id/module_map_id_remaining_distance_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="@+id/module_map_id_remaining_distance_notice"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_remaining_distance_notice"
+        app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_distance"
+        app:layout_constraintRight_toLeftOf="@+id/module_map_id_remaining_distance_notice"
+        android:src="@drawable/module_ext_ic_navi_info1" />
+    <TextView
+        android:id="@+id/module_map_id_remaining_distance_notice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="剩余"
+        android:textColor="#7FFFFFFF"
+        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
+        app:layout_constraintRight_toRightOf="@+id/module_map_id_remaining_distance_unit"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_distance_icon"
+        app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_distance" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/remainTimeGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="module_map_id_remaining_time_icon,module_map_id_remaining_time,module_map_id_remaining_time_unit,module_map_id_remaining_time_notice" />
+    <!--remain time-->
+    <TextView
+        android:id="@+id/module_map_id_remaining_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3599"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_remaining_time_textSize"
+        android:textStyle="bold"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
+        app:layout_constraintRight_toLeftOf="@+id/module_map_id_arrive_time"
+        app:layout_constraintLeft_toRightOf="@+id/module_map_id_remaining_distance"
+        app:layout_constraintBottom_toTopOf="@id/module_map_id_remaining_time_notice" />
+
+    <TextView
+        android:id="@+id/module_map_id_remaining_time_unit"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="km"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_remaining_time_unit_textSize"
+        app:layout_constraintBaseline_toBaselineOf="@id/module_map_id_remaining_time"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_time" />
+    <ImageView
+        android:id="@+id/module_map_id_remaining_time_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:src="@drawable/module_ext_ic_navi_info2"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintLeft_toLeftOf="@id/module_map_id_remaining_time"
+        app:layout_constraintRight_toLeftOf="@id/module_map_id_remaining_time_notice"
+        app:layout_constraintTop_toTopOf="@id/module_map_id_remaining_time_notice"
+        app:layout_constraintBottom_toBottomOf="@id/module_map_id_remaining_time_notice"
+        />
+    <TextView
+        android:id="@+id/module_map_id_remaining_time_notice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="时间"
+        android:textColor="#7FFFFFFF"
+        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_remaining_time_icon"
+        app:layout_constraintRight_toRightOf="@id/module_map_id_remaining_time_unit"
+        app:layout_constraintTop_toBottomOf="@id/module_map_id_remaining_time" />
+
+    <androidx.constraintlayout.widget.Group
+        android:id="@+id/arriveTimeGroup"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:constraint_referenced_ids="module_map_id_arrive_time_icon,module_map_id_arrive_time,module_map_id_arrive_time_notice" />
+    <!--arrive time-->
+
+    <TextView
+        android:id="@+id/module_map_id_arrive_time"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="3599"
+        android:textColor="#F1F1F1"
+        android:textSize="@dimen/module_ext_arrive_time_textSize"
+        android:layout_marginEnd="@dimen/dp_96"
+        android:textStyle="bold"
+        app:layout_constraintVertical_chainStyle="packed"
+        app:layout_constraintTop_toTopOf="@id/module_map_id_navi_bg"
+        app:layout_constraintRight_toRightOf="@id/module_map_id_navi_bg"
+        app:layout_constraintLeft_toRightOf="@+id/module_map_id_remaining_time"
+        app:layout_constraintBottom_toTopOf="@id/module_map_id_arrive_time_notice"/>
+    <ImageView
+        android:id="@+id/module_map_id_arrive_time_icon"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:layout_constraintLeft_toLeftOf="@id/module_map_id_arrive_time"
+        app:layout_constraintTop_toTopOf="@+id/module_map_id_arrive_time_notice"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_arrive_time_notice"
+        app:layout_constraintHorizontal_chainStyle="packed"
+        app:layout_constraintRight_toLeftOf="@+id/module_map_id_arrive_time_notice"
+        android:src="@drawable/module_ext_ic_navi_info3" />
+    <TextView
+        android:id="@+id/module_map_id_arrive_time_notice"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:text="到达"
+        android:textColor="#7FFFFFFF"
+        android:textSize="@dimen/module_ext_remaining_distance_unit_textSize"
+        app:layout_constraintLeft_toRightOf="@id/module_map_id_arrive_time_icon"
+        app:layout_constraintRight_toRightOf="@id/module_map_id_arrive_time"
+        app:layout_constraintBottom_toBottomOf="@+id/module_map_id_navi_bg"
+        app:layout_constraintTop_toBottomOf="@id/module_map_id_arrive_time" />
+</merge>

modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml

@@ -30,7 +30,7 @@
         android:textSize="@dimen/module_ext_north_textSize"
         android:textStyle="bold"
         android:visibility="gone"
-        tools:visibility="gone"
+        tools:visibility="visible"
         app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition"
         app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"
         app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" />
@@ -173,4 +173,37 @@
             android:textStyle="bold"
             android:visibility="gone" />
     </LinearLayout>
+
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/btnDebugCtrlTopView"
+        android:text="显示隐藏TopView"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toBottomOf="parent"
+        android:textSize="20sp" />
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/btnDebugCtrlSubView"
+        android:text="显示隐藏SubView"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/btnDebugCtrlTopView"
+        android:textSize="20sp" />
+    <Button
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:id="@+id/btnDebugCtrlNaviView"
+        android:text="显示隐藏导航view"
+        app:layout_constraintLeft_toLeftOf="parent"
+        app:layout_constraintBottom_toTopOf="@id/btnDebugCtrlSubView"
+        android:textSize="20sp" />
+
+    <androidx.constraintlayout.widget.Group
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        app:constraint_referenced_ids="btnDebugCtrlNaviView,btnDebugCtrlSubView,btnDebugCtrlTopView"
+        android:id="@+id/groupTopViewDebug" />
+
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-extensions/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -0,0 +1,143 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    module_ext_layout_entrance.xml-->
+    <dimen name="module_ext_search_height">90px</dimen>
+    <dimen name="module_ext_search_marginLeft">32px</dimen>
+    <dimen name="module_ext_search_marginTop">2px</dimen>
+    <dimen name="module_ext_search_drawablePadding">16px</dimen>
+    <dimen name="module_ext_search_paddingLeft">26px</dimen>
+    <dimen name="module_ext_search_paddingRight">26px</dimen>
+    <dimen name="module_ext_search_textSize">32px</dimen>
+
+    <dimen name="module_ext_common_address_height">90px</dimen>
+    <dimen name="module_ext_common_address_marginLeft">32px</dimen>
+    <dimen name="module_ext_common_address_marginTop">2px</dimen>
+    <dimen name="module_ext_common_address_home_width">100px</dimen>
+    <dimen name="module_ext_common_address_home_height">90px</dimen>
+    <dimen name="module_ext_common_address_divider_width">2px</dimen>
+    <dimen name="module_ext_common_address_divider_height">54px</dimen>
+    <dimen name="module_ext_common_address_company_width">100px</dimen>
+    <dimen name="module_ext_common_address_company_height">90px</dimen>
+
+    <dimen name="module_ext_speed_limit_width">180px</dimen>
+    <dimen name="module_ext_speed_limit_height">180px</dimen>
+    <dimen name="module_ext_speed_limit_marginTop">2px</dimen>
+    <dimen name="module_ext_speed_limit_marginRight">60px</dimen>
+    <dimen name="module_ext_speed_limit_value_textSize">60px</dimen>
+    <dimen name="module_ext_speed_limit_unit_textSize">28px</dimen>
+
+    <dimen name="module_ext_navi_panel_marginLeft">32px</dimen>
+    <dimen name="module_ext_navi_panel_marginTop">2px</dimen>
+
+    <dimen name="module_ext_operation_panel_width">120px</dimen>
+    <dimen name="module_ext_operation_panel_marginRight">32px</dimen>
+    <dimen name="module_ext_operation_panel_marginBottom">60px</dimen>
+    <dimen name="module_ext_operation_panel_vr_height">92px</dimen>
+    <dimen name="module_ext_operation_panel_vr_textSize">24px</dimen>
+    <dimen name="module_ext_operation_panel_divider_width">48px</dimen>
+    <dimen name="module_ext_operation_panel_divider_height">2px</dimen>
+    <dimen name="module_ext_operation_panel_move2_height">120px</dimen>
+    <dimen name="module_ext_operation_panel_share_width">120px</dimen>
+    <dimen name="module_ext_operation_panel_share_height">120px</dimen>
+    <dimen name="module_ext_operation_panel_share_marginBottom">40px</dimen>
+    <dimen name="module_ext_operation_panel_share_textSize">30px</dimen>
+    <dimen name="module_ext_operation_panel_share_goneMarginBottom">32px</dimen>
+    <dimen name="module_ext_operation_panel_share_goneMarginRight">32px</dimen>
+
+    <dimen name="module_ext_navi_exit_width">120px</dimen>
+    <dimen name="module_ext_navi_exit_height">120px</dimen>
+    <dimen name="module_ext_navi_exit_marginLeft">32px</dimen>
+    <dimen name="module_ext_navi_exit_marginBottom">60px</dimen>
+    <dimen name="module_ext_button_container_marginLeft">32px</dimen>
+    <dimen name="module_ext_button_container_marginBottom">60px</dimen>
+    <dimen name="module_ext_navi_exit_textSize">32px</dimen>
+    <dimen name="module_entrance_id_button_marginTop">20px</dimen>
+
+    <!--    module_ext_layout_extensions.xml-->
+    <dimen name="module_ext_height">100px</dimen>
+    <dimen name="module_ext_paddingRight">60px</dimen>
+    <dimen name="module_ext_paddingLeft">60px</dimen>
+    <dimen name="module_ext_voice_textSize">32px</dimen>
+    <dimen name="module_ext_time_textSize">48px</dimen>
+    <dimen name="module_ext_date_marginRight">80px</dimen>
+    <dimen name="module_ext_date_textSize">28px</dimen>
+    <dimen name="module_ext_weather_marginRight">26px</dimen>
+    <dimen name="module_ext_weather_icon_width">44px</dimen>
+    <dimen name="module_ext_weather_icon_height">44px</dimen>
+    <dimen name="module_ext_weather_temp_marginRight">18px</dimen>
+    <dimen name="module_ext_weather_temp_textSize">34px</dimen>
+    <dimen name="module_ext_weather_temp_desc_marginRight">26px</dimen>
+    <dimen name="module_ext_weather_temp_desc_textSize">28px</dimen>
+    <dimen name="module_ext_msg_marginRight">30px</dimen>
+    <dimen name="module_ext_msg_counter_width">30px</dimen>
+    <dimen name="module_ext_msg_counter_height">30px</dimen>
+    <dimen name="module_ext_msg_counter_textSize">20px</dimen>
+
+    <dimen name="module_ext_user_img_width">103px</dimen>
+    <dimen name="module_ext_user_img_height">103px</dimen>
+
+    <!--    module_map_layout_navi_info_panel.xml-->
+    <dimen name="module_ext_navi_info_panel_width">1058px</dimen>
+    <dimen name="module_ext_navi_info_panel_height">210px</dimen>
+    <dimen name="module_ext_navi_info_panel_small_height">144px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_width">159px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_height">159px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_width">70px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_height">70px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginLeft">24px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_small_marginLeft">83px</dimen>
+    <dimen name="module_ext_navi_info_panel_turn_icon_marginTop">24px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_marginTop">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_textSize">60px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginLeft">12px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_marginBottom">10px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_unit_textSize">40px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_road_textSize">34px</dimen>
+    <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_marginTop">24px</dimen>
+    <dimen name="module_ext_navi_info_panel__arrive_destination_estimate_info_textSize">28px</dimen>
+    <dimen name="module_ext_navi_info_turn_icon_margin_bottom">23px</dimen>
+    <dimen name="module_ext_voice_msg_padding_top">17px</dimen>
+    <dimen name="module_ext_voice_msg_padding_bottom">17px</dimen>
+    <dimen name="module_ext_voice_msg_padding_left">36px</dimen>
+    <dimen name="module_ext_voice_msg_padding_right">36px</dimen>
+    <dimen name="module_ext_voice_msg_icon_margin_left">-2px</dimen>
+
+    <dimen name="module_ext_weather_bkg_corner">30px</dimen>
+    <dimen name="module_ext_weather_container_paddingLeft">40px</dimen>
+    <dimen name="module_ext_weather_container_paddingRight">40px</dimen>
+    <dimen name="module_ext_msg_dot_marginLeft">15px</dimen>
+    <dimen name="module_ext_msg_dot_marginRight">15px</dimen>
+    <dimen name="module_ext_navi_next_info_road_marginTop">5px</dimen>
+    <dimen name="module_ext_remaining_info_marginRight">50px</dimen>
+    <dimen name="module_ext_remaining_distance_textSize">56px</dimen>
+    <dimen name="module_ext_remaining_distance_unit_textSize">30px</dimen>
+    <dimen name="module_ext_remaining_time_textSize">56px</dimen>
+    <dimen name="module_ext_remaining_time_unit_textSize">30px</dimen>
+    <dimen name="module_ext_arrive_time_textSize">56px</dimen>
+    <dimen name="module_ext_arrive_time_unit_textSize">30px</dimen>
+    <dimen name="module_map_navi_next_info_road_turn_marginLeft">15px</dimen>
+    <dimen name="module_map_navi_next_info_road_turn_marginRight">15px</dimen>
+
+    <!-- 导航查看全程显示范围-->
+    <dimen name="module_map_display_overview_left_margin">1000px</dimen>
+    <dimen name="module_map_display_overview_top_margin">390px</dimen>
+    <dimen name="module_map_display_overview_bottom_margin">200px</dimen>
+    <dimen name="module_map_display_overview_right_margin">200px</dimen>
+    <dimen name="module_ext_north_goneMarginTop">240px</dimen>
+    <dimen name="module_ext_common_corner">30px</dimen>
+    <dimen name="module_ext_button_width">120px</dimen>
+    <dimen name="module_ext_button_height">120px</dimen>
+    <dimen name="module_ext_camera_button_marginTop">30px</dimen>
+    <dimen name="module_ext_display_overview_textSize">22px</dimen>
+    <dimen name="module_ext_display_overview_textSize_large">28px</dimen>
+    <dimen name="module_ext_north_textSize">28px</dimen>
+    <dimen name="module_ext_navi_info_panel_next_info_distance_next_step_textSize">30px</dimen>
+    <dimen name="module_entrance_id_uploading_width">90px</dimen>
+    <dimen name="module_entrance_id_uploading_height">90px</dimen>
+    <dimen name="module_map_id_navi_next_info_distance_marginTop">6dp</dimen>
+    <dimen name="module_map_id_navi_next_info_road_marginBottom">15px</dimen>
+    <dimen name="module_map_id_navi_next_info_distance_marginStart">10px</dimen>
+    <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
+
+    <dimen name="module_ext_top_over_navi_height">40px</dimen>
+</resources>

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

@@ -139,4 +139,5 @@
     <dimen name="module_map_id_navi_next_info_distance_marginStart">10px</dimen>
     <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
 
+    <dimen name="module_ext_top_over_navi_height">34px</dimen>
 </resources>

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

@@ -142,4 +142,6 @@
     <dimen name="module_map_id_navi_next_info_road_marginBottom">10px</dimen>
     <dimen name="module_map_id_navi_next_info_distance_marginStart">6px</dimen>
     <dimen name="module_ext_display_overview_icon_marginTop">10px</dimen>
+
+    <dimen name="module_ext_top_over_navi_height">19px</dimen>
 </resources>

modules/mogo-module-left-panel/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="module_left_panel_simple_speed_text_size">122px</dimen>
+    <dimen name="module_left_panel_simple_speed_text_margin_top">110px</dimen>
+    <dimen name="module_left_panel_simple_speed_title_size">30px</dimen>
+    <dimen name="module_left_panel_simple_speed_title_margin">47px</dimen>
+
+</resources>

modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml

@@ -43,10 +43,12 @@
     <!--快捷操作浮层-->
     <FrameLayout
         android:id="@+id/module_main_id_entrance_fragment_container"
-        android:layout_width="match_parent"
+        android:layout_width="@dimen/module_main_entrance_fragment_container_width"
         android:layout_height="match_parent"
-        android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
+        android:layout_gravity="right"
-        android:padding="@dimen/module_main_entrance_fragment_container_padding" />
+        android:paddingRight="@dimen/module_main_entrance_fragment_container_padding"
+        android:paddingBottom="@dimen/module_main_entrance_fragment_container_padding"
+        android:paddingTop="@dimen/module_main_entrance_fragment_container_padding" />
 
     <FrameLayout
         android:id="@+id/module_main_id_event_panel_fragment_container"

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

@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!--    module_main_activity_main.xml-->
+    <dimen name="module_main_map_left_shadow_frame_width">350px</dimen>
+    <dimen name="module_main_card_container_marginTop">10px</dimen>
+    <dimen name="module_main_card_container_width">660px</dimen>
+    <dimen name="module_main_card_container_height">690px</dimen>
+    <dimen name="module_main_card_container_marginLeft">60px</dimen>
+    <dimen name="module_main_card_container_marginBottom">211px</dimen>
+    <dimen name="module_main_card_container_paddingBottom">30px</dimen>
+    <dimen name="module_main_card_card_shadow_width_div">30px</dimen>
+    <dimen name="module_main_card_card_shadow_height_div">15px</dimen>
+    <dimen name="module_main_top_shadow_height">270px</dimen>
+    <dimen name="module_main_card_cover_up_margin">660px</dimen>
+    <dimen name="cards_container_dp_600">600px</dimen>
+    <dimen name="cards_container_shadow_dp_margin_top">599px</dimen>
+
+    <dimen name="module_main_apps_fragment_container_width">200px</dimen>
+    <dimen name="module_main_apps_fragment_container_padding">30px</dimen>
+    <dimen name="module_main_header_fragment_container_marginTop">30px</dimen>
+    <dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
+    <dimen name="module_main_id_entrance_fragment_container_marginLeft">590px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding">30px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding_top">70px</dimen>
+
+    <dimen name="module_main_id_left_panel_fragment_container_width">635px</dimen>
+    <dimen name="module_main_entrance_fragment_container_width">1263px</dimen>
+
+</resources>

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

@@ -21,7 +21,8 @@
     <dimen name="module_main_header_fragment_container_marginLeft">830px</dimen>
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">800px</dimen>
     <dimen name="module_main_entrance_fragment_container_padding">30px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding_top">30px</dimen>
 
     <dimen name="module_main_id_left_panel_fragment_container_width">340px</dimen>
-
+    <dimen name="module_main_entrance_fragment_container_width">1313px</dimen>
 </resources>

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

@@ -23,5 +23,8 @@
     <dimen name="module_main_id_entrance_fragment_container_marginLeft">444px</dimen>
     <dimen name="module_main_id_left_panel_fragment_container_width">350px</dimen>
     <dimen name="module_main_entrance_fragment_container_padding">16px</dimen>
+    <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
+
+    <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
 
 </resources>

modules/mogo-module-share/src/main/res/layout/launcher_dialog_share_2.xml

@@ -39,132 +39,132 @@
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_block_up"
         android:text="拥堵"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         app:layout_constraintHorizontal_chainStyle="spread_inside"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@+id/btn_share_title"
         app:layout_constraintRight_toLeftOf="@+id/tvTrafficCheck"
         app:layout_constraintLeft_toLeftOf="@+id/vBg"
-        android:layout_marginStart="@dimen/dp_116"
+        android:layout_marginStart="@dimen/share_module_btn_margin_left_right"
-        android:layout_marginTop="@dimen/dp_78"
+        android:layout_marginTop="@dimen/share_module_first_btn_margin_top"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvTrafficCheck"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_traffic_check"
         android:text="交通检查"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         android:gravity="center"
         app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@id/tvBlock"
         app:layout_constraintRight_toLeftOf="@+id/tvClosure"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvClosure"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_road_closure"
         android:text="封路"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@+id/tvTrafficCheck"
         app:layout_constraintRight_toLeftOf="@+id/tvAccident"
         android:textColor="#fff"
         android:gravity="center"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvAccident"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_accident"
         android:text="事故"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@+id/tvClosure"
         app:layout_constraintRight_toLeftOf="@+id/tvConstruction"
         android:textColor="#fff"
         android:gravity="center"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvConstruction"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_road_construction"
         android:text="施工"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         app:layout_constraintTop_toTopOf="@+id/tvBlock"
         app:layout_constraintLeft_toRightOf="@+id/tvAccident"
         app:layout_constraintRight_toRightOf="@+id/vBg"
-        android:layout_marginEnd="@dimen/dp_116"
+        android:layout_marginEnd="@dimen/share_module_btn_margin_left_right"
         android:textColor="#fff"
         android:gravity="center"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvRealTimeTraffic"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_real_time_traffic"
         android:text="实时路况"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@+id/tvBlock"
         app:layout_constraintLeft_toLeftOf="@+id/tvBlock"
-        android:layout_marginTop="@dimen/dp_62"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvSeekHelp"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_seek_help"
         android:text="故障求助"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@+id/tvTrafficCheck"
         app:layout_constraintLeft_toLeftOf="@+id/tvTrafficCheck"
-        android:layout_marginTop="@dimen/dp_62"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvStagnantWater"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_stagnant_water"
         android:text="道路积水"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         android:gravity="center"
         app:layout_constraintTop_toBottomOf="@+id/tvClosure"
         app:layout_constraintLeft_toLeftOf="@+id/tvClosure"
-        android:layout_marginTop="@dimen/dp_62"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvRoadIcy"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_road_icy"
         android:text="道路结冰"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         app:layout_constraintTop_toBottomOf="@+id/tvAccident"
         app:layout_constraintLeft_toLeftOf="@+id/tvAccident"
-        android:layout_marginTop="@dimen/dp_62"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
         android:gravity="center"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
     <TextView
         android:id="@+id/tvDenseFog"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:drawableTop="@drawable/share_dense_fog"
         android:text="浓雾"
-        android:textSize="@dimen/dp_32"
+        android:textSize="@dimen/share_module_btn_text_size"
         android:textColor="#fff"
         app:layout_constraintTop_toBottomOf="@+id/tvConstruction"
         app:layout_constraintLeft_toLeftOf="@+id/tvConstruction"
-        android:layout_marginTop="@dimen/dp_62"
+        android:layout_marginTop="@dimen/share_module_sec_btn_margin_top"
         android:gravity="center"
-        android:drawablePadding="@dimen/dp_30" />
+        android:drawablePadding="@dimen/share_module_drawable_padding" />
 </androidx.constraintlayout.widget.ConstraintLayout>

modules/mogo-module-share/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -0,0 +1,26 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <dimen name="share_module_width">1318px</dimen>
+    <dimen name="share_module_height">727px</dimen>
+    <dimen name="share_module_margin_top">64px</dimen>
+    <dimen name="share_module_title_margin_top">51px</dimen>
+    <dimen name="share_module_first_margin_left">200px</dimen>
+    <dimen name="share_module_margin_left">210px</dimen>
+    <dimen name="share_module_tv_margin_top">30px</dimen>
+    <dimen name="share_module_image_width">160px</dimen>
+    <dimen name="share_module_image_width_second">198px</dimen>
+    <dimen name="share_module_bottom_margin_top">55px</dimen>
+    <dimen name="share_module_first_btn_margin_top">70px</dimen>
+    <dimen name="share_module_sec_btn_margin_top">56px</dimen>
+    <dimen name="share_module_drawable_padding">27px</dimen>
+    <dimen name="share_module_btn_margin_left_right">105px</dimen>
+
+    <!--字体-->
+    <dimen name="share_module_title_content">36px</dimen>
+    <dimen name="share_module_item">32px</dimen>
+    <dimen name="share_module_bottom_size">28px</dimen>
+    <dimen name="share_module_btn_text_size">28px</dimen>
+
+</resources>
+
+

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

@@ -10,11 +10,16 @@
     <dimen name="share_module_image_width">160px</dimen>
     <dimen name="share_module_image_width_second">198px</dimen>
     <dimen name="share_module_bottom_margin_top">55px</dimen>
+    <dimen name="share_module_first_btn_margin_top">78px</dimen>
+    <dimen name="share_module_sec_btn_margin_top">62px</dimen>
+    <dimen name="share_module_drawable_padding">30px</dimen>
+    <dimen name="share_module_btn_margin_left_right">116px</dimen>
 
     <!--字体-->
     <dimen name="share_module_title_content">40px</dimen>
     <dimen name="share_module_item">32px</dimen>
     <dimen name="share_module_bottom_size">28px</dimen>
+    <dimen name="share_module_btn_text_size">32px</dimen>
 
 </resources>
 

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

@@ -11,10 +11,15 @@
     <dimen name="share_module_image_width">85px</dimen>
     <dimen name="share_module_image_width_second">110px</dimen>
     <dimen name="share_module_bottom_margin_top">28px</dimen>
+    <dimen name="share_module_first_btn_margin_top">42.6px</dimen>
+    <dimen name="share_module_sec_btn_margin_top">34px</dimen>
+    <dimen name="share_module_drawable_padding">16.4px</dimen>
+    <dimen name="share_module_btn_margin_left_right">63.4px</dimen>
 
     <!--字体-->
     <dimen name="share_module_title_content">22px</dimen>
     <dimen name="share_module_item">18px</dimen>
     <dimen name="share_module_bottom_size">15px</dimen>
+    <dimen name="share_module_btn_text_size">17.5px</dimen>
 
 </resources>

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashConst.kt

@@ -1,6 +1,6 @@
 package com.zhidao.mogo.module.splash
 
-object BydConst {
+object SplashConst {
     const val MODULE_NAME = "MODULE_SPLASH"
     const val PATH_NAME = "/splash/api"
 }

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/SplashProvider.kt

@@ -13,8 +13,8 @@ import com.mogo.map.navi.IMogoNaviListener
 import com.mogo.service.module.IMogoModuleLifecycle
 import com.mogo.service.module.IMogoModuleProvider
 import com.mogo.utils.logger.Logger
-import com.zhidao.mogo.module.splash.BydConst.MODULE_NAME
+import com.zhidao.mogo.module.splash.SplashConst.MODULE_NAME
-import com.zhidao.mogo.module.splash.BydConst.PATH_NAME
+import com.zhidao.mogo.module.splash.SplashConst.PATH_NAME
 import com.zhidao.mogo.module.splash.fragment.BydSplashFragment
 
 /**
@@ -23,7 +23,7 @@ import com.zhidao.mogo.module.splash.fragment.BydSplashFragment
  * @author tongchenfei
  */
 @Route(path = PATH_NAME)
-class BydProvider : IMogoModuleProvider {
+class SplashProvider : IMogoModuleProvider {
     override fun getNaviListener(): IMogoNaviListener? {
         return null
     }

modules/mogo-module-splash/src/main/java/com/zhidao/mogo/module/splash/fragment/BydSplashFragment.kt

@@ -1,19 +1,53 @@
 package com.zhidao.mogo.module.splash.fragment
 
+import android.os.Handler
+import android.os.Message
 import com.mogo.commons.mvp.MvpFragment
 import com.zhidao.mogo.module.splash.R
 import com.zhidao.mogo.module.splash.presenter.BydSplashPresenter
 import kotlinx.android.synthetic.main.fragment_byd_splash.*
 
-class BydSplashFragment :MvpFragment<BydSplashFragment,BydSplashPresenter>(){
+const val DEFAULT_COUNT_DOWN_TIME = 5
+const val MSG_COUNT_DOWN = 1001
+const val DEFAULT_COUNT_DOWN_DELAY = 1000L
+class BydSplashFragment :MvpFragment<BydSplashFragment,BydSplashPresenter>(),Handler.Callback{
+    private val handler = Handler(this)
+    private var countDownTime = DEFAULT_COUNT_DOWN_TIME
+
     override fun getLayoutId(): Int = R.layout.fragment_byd_splash
 
     override fun initViews() {
+        startCountDown()
         tvByd.setOnClickListener {
-            activity!!.supportFragmentManager.beginTransaction().remove(this).commit()
+            hideSplash()
         }
     }
 
     override fun createPresenter(): BydSplashPresenter = BydSplashPresenter(this)
 
+    private fun startCountDown(){
+        handler.removeMessages(MSG_COUNT_DOWN)
+        countDownTime = DEFAULT_COUNT_DOWN_TIME
+        tvCountDown.text = countDownTime.toString()
+        handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY)
+    }
+
+    override fun handleMessage(msg: Message): Boolean {
+        if (msg.what == MSG_COUNT_DOWN) {
+            countDownTime--
+            if(countDownTime>0) {
+                tvCountDown.text = countDownTime.toString()
+                handler.sendEmptyMessageDelayed(MSG_COUNT_DOWN, DEFAULT_COUNT_DOWN_DELAY)
+            }else{
+                hideSplash()
+            }
+            return true
+        }
+        return false
+    }
+
+    private fun hideSplash(){
+        handler.removeMessages(MSG_COUNT_DOWN)
+        activity!!.supportFragmentManager.beginTransaction().remove(this).commit()
+    }
 }

modules/mogo-module-splash/src/main/res/layout/fragment_byd_splash.xml

@@ -20,4 +20,16 @@
         app:layout_constraintStart_toStartOf="parent"
         app:layout_constraintTop_toTopOf="parent" />
 
+    <TextView
+        android:id="@+id/tvCountDown"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:padding="20dp"
+        android:text="5"
+        android:textColor="#000"
+        android:textSize="30sp"
+        app:layout_constraintRight_toRightOf="parent"
+        app:layout_constraintTop_toTopOf="parent" />
+
+
 </androidx.constraintlayout.widget.ConstraintLayout>