From f35e1eb301c3919a7f05a740ac1c4d144f8e0a38 Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Tue, 26 May 2020 19:43:49 +0800 Subject: [PATCH] ui opt --- .idea/misc.xml | 2 +- .../src/main/res/values-ldpi/dimens.xml | 4 +- .../src/main/res/values-xhdpi/dimens.xml | 4 +- .../src/main/res/values/dimens.xml | 4 +- .../extensions/entrance/EntranceFragment.java | 17 +- .../extensions/navi/BaseNaviInfoView.java | 19 +- .../module/extensions/navi/NaviInfoView.java | 34 +-- .../res/layout/module_ext_layout_entrance.xml | 25 ++- .../module_map_layout_navi_info_panel_2.xml | 196 ------------------ .../src/main/res/values-ldpi/dimens.xml | 7 +- .../src/main/res/values-xhdpi/dimens.xml | 3 + .../src/main/res/values/dimens.xml | 3 + .../module_main_dw_left_frame_bkg.xml | 5 +- .../src/main/res/values-ldpi/dimens.xml | 2 +- .../src/main/res/values-xhdpi/dimens.xml | 2 +- .../src/main/res/values/dimens.xml | 2 +- .../service/marker/MapMarkerManager.java | 5 +- .../src/main/res/layout/view_map_marker.xml | 2 +- .../main/res/layout/view_map_marker_info.xml | 13 +- 19 files changed, 71 insertions(+), 278 deletions(-) delete mode 100644 modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml diff --git a/.idea/misc.xml b/.idea/misc.xml index 707ee6e613..2dc54c489f 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,6 @@ - + \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml index 5b12d6e39c..c9efac23e8 100644 --- a/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-ldpi/dimens.xml @@ -24,6 +24,6 @@ 78px 78px 17px - 78px - 78px + 70px + 70px \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml index 993c7c44b2..e4753b0f9d 100644 --- a/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values-xhdpi/dimens.xml @@ -24,6 +24,6 @@ 140px 140px 30px - 120px - 120px + 110px + 110px \ No newline at end of file diff --git a/modules/mogo-module-apps/src/main/res/values/dimens.xml b/modules/mogo-module-apps/src/main/res/values/dimens.xml index b31ac60e8f..531b3a851b 100644 --- a/modules/mogo-module-apps/src/main/res/values/dimens.xml +++ b/modules/mogo-module-apps/src/main/res/values/dimens.xml @@ -24,6 +24,6 @@ 140px 140px 30px - 120px - 120px + 110px + 110px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java index fd6377a2e2..5bf3a1c9ae 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/entrance/EntranceFragment.java @@ -39,6 +39,7 @@ import com.mogo.module.common.map.MapCenterPointStrategy; import com.mogo.module.common.map.Scene; import com.mogo.module.extensions.ExtensionsModuleConst; import com.mogo.module.extensions.R; +import com.mogo.module.extensions.navi.NaviInfoView; import com.mogo.module.extensions.utils.TopViewAnimHelper; import com.mogo.module.share.ShareControl; import com.mogo.service.IMogoServiceApis; @@ -85,7 +86,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent private View mMove2CurrentLocation; -// private NaviInfoView mNaviInfo; + private NaviInfoView mNaviInfo; private TextView mExitNavi; @@ -264,6 +265,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent if(rootView!=null) { TopViewAnimHelper.getInstance().init(rootView); } + TopViewAnimHelper.getInstance().setIMogoMapUIController( mMApUIController ); mExitNavi = findViewById( R.id.module_entrance_id_exit_navi ); mExitNavi.setOnClickListener( view -> { @@ -324,6 +326,9 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent ResourcesHelper.getDimensionPixelSize( getContext(), R.dimen.module_map_display_overview_right_margin ), ResourcesHelper.getDimensionPixelSize( getContext(), R.dimen.module_map_display_overview_bottom_margin ) ); + + mNaviInfo = new NaviInfoView(); + mNaviInfo.inflate( rootView ); } private static final String AUTONAVI_STANDARD_BROADCAST_RECV = "AUTONAVI_STANDARD_BROADCAST_RECV"; @@ -394,27 +399,29 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent if ( naviinfo == null ) { return; } -// mNaviInfo.notifyChanged( naviinfo ); + mNaviInfo.notifyChanged( naviinfo ); } @Override public void onStartNavi() { -// mNaviInfo.setVisibility( View.VISIBLE ); + TopViewAnimHelper.getInstance().showNaviView(); mExitNavi.setVisibility( View.VISIBLE ); mMApUIController.changeMapMode( mCameraMode.isSelected() ? EnumMapUI.NorthUP_2D : EnumMapUI.CarUp_2D ); MapCenterPointStrategy.setMapCenterPointBySceneAndDelay( mMApUIController, Scene.NAVI, 500, () -> { return !mMogoNavi.isNaviing(); } ); mDisplayOverview.setVisibility( View.VISIBLE ); + mCameraMode.setVisibility( View.VISIBLE ); mApis.getAnalyticsApi().track( "Navigation_begin", new HashMap<>() ); } @Override public void onStopNavi() { -// mNaviInfo.setVisibility( View.GONE ); + TopViewAnimHelper.getInstance().hideNaviView(); mExitNavi.setVisibility( View.GONE ); mMApUIController.changeMapMode( EnumMapUI.NorthUP_2D ); mDisplayOverview.setVisibility( View.GONE ); + mCameraMode.setVisibility( View.GONE ); MapCenterPointStrategy.setMapCenterPointByScene( mMApUIController, Scene.AIMLESS ); } @@ -471,7 +478,7 @@ public class EntranceFragment extends MvpFragment< EntranceView, EntrancePresent return; } if ( isTrue ) { - mDisplayOverviewText.setText( "退出全览" ); + mDisplayOverviewText.setText( "退出\n全览" ); mCameraMode.setVisibility( View.GONE ); } else { mDisplayOverviewText.setText( "全览" ); diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java index 700c23d406..13101f2587 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/BaseNaviInfoView.java @@ -1,13 +1,8 @@ package com.mogo.module.extensions.navi; -import android.content.Context; -import android.util.AttributeSet; import android.widget.ImageView; -import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.annotation.Nullable; - import com.mogo.map.impl.amap.utils.IconTypeUtils; import com.mogo.map.navi.MogoNaviInfo; @@ -20,19 +15,7 @@ import java.util.Calendar; *

* 描述 */ -public abstract class BaseNaviInfoView extends RelativeLayout { - - public BaseNaviInfoView( Context context ) { - this( context, null ); - } - - public BaseNaviInfoView( Context context, @Nullable AttributeSet attrs ) { - this( context, attrs, 0 ); - } - - public BaseNaviInfoView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { - super( context, attrs, defStyleAttr ); - } +public abstract class BaseNaviInfoView { public void notifyChanged( MogoNaviInfo naviInfo ) { diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java index c15abd7991..59970e730e 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/navi/NaviInfoView.java @@ -1,13 +1,9 @@ package com.mogo.module.extensions.navi; -import android.content.Context; -import android.util.AttributeSet; import android.view.View; import android.widget.ImageView; import android.widget.TextView; -import androidx.annotation.Nullable; - import com.mogo.map.navi.MogoNaviInfo; import com.mogo.module.extensions.R; @@ -30,27 +26,17 @@ public class NaviInfoView extends BaseNaviInfoView { private TextView remainingTimeUnit; private TextView arriveTime; - public NaviInfoView( Context context ) { - this( context, null ); - } + public void inflate(View view){ + turnIcon = view.findViewById( R.id.module_map_id_navi_next_info_road_turn_icon ); + distance = view.findViewById( R.id.module_map_id_navi_next_info_distance ); + distanceUnit = view.findViewById( R.id.module_map_id_navi_next_info_distance_unit ); + nextRoad = view.findViewById( R.id.module_map_id_navi_next_info_road ); - public NaviInfoView( Context context, @Nullable AttributeSet attrs ) { - this( context, attrs, 0 ); - } - - public NaviInfoView( Context context, @Nullable AttributeSet attrs, int defStyleAttr ) { - super( context, attrs, defStyleAttr ); - View.inflate( context, R.layout.module_map_layout_navi_info_panel, this ); - turnIcon = findViewById( R.id.module_map_id_navi_next_info_road_turn_icon ); - distance = findViewById( R.id.module_map_id_navi_next_info_distance ); - distanceUnit = findViewById( R.id.module_map_id_navi_next_info_distance_unit ); - nextRoad = findViewById( R.id.module_map_id_navi_next_info_road ); - - remainingDistance = findViewById( R.id.module_map_id_remaining_distance ); - remainingDistanceUnit = findViewById( R.id.module_map_id_remaining_distance_unit ); - remainingTime = findViewById( R.id.module_map_id_remaining_time ); - remainingTimeUnit = findViewById( R.id.module_map_id_remaining_time_unit ); - arriveTime = findViewById( R.id.module_map_id_arrive_time ); + remainingDistance = view.findViewById( R.id.module_map_id_remaining_distance ); + remainingDistanceUnit = view.findViewById( R.id.module_map_id_remaining_distance_unit ); + remainingTime = view.findViewById( R.id.module_map_id_remaining_time ); + remainingTimeUnit = view.findViewById( R.id.module_map_id_remaining_time_unit ); + arriveTime = view.findViewById( R.id.module_map_id_arrive_time ); } @Override diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml index fc61c6281f..178a974615 100644 --- a/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml +++ b/modules/mogo-module-extensions/src/main/res/layout/module_ext_layout_entrance.xml @@ -1,6 +1,7 @@ @@ -71,7 +72,7 @@ android:layout_marginBottom="@dimen/module_ext_navi_info_panel_next_info_distance_unit_marginBottom" android:text="左转进入" android:textColor="#7FF1F1F1" - android:textSize="@dimen/module_ext_navi_info_panel_next_info_distance_unit_textSize" + 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" /> @@ -235,6 +236,7 @@ android:gravity="center_horizontal" android:paddingTop="@dimen/dp_14" android:text="@string/mode_north_up" + android:visibility="gone" android:textColor="@color/white" android:textSize="@dimen/module_ext_north_textSize" app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition" @@ -250,7 +252,7 @@ android:background="@drawable/module_ext_dw_common_corner_bkg" android:gravity="center" android:orientation="vertical" - android:visibility="visible" + android:visibility="gone" app:layout_constraintLeft_toLeftOf="@+id/module_map_id_navi_bg" app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg"> @@ -292,6 +294,7 @@ android:layout_width="@dimen/module_ext_operation_panel_share_width" android:layout_height="@dimen/module_ext_operation_panel_share_height" android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom" + android:background="@drawable/module_ext_dw_upload_road_condition_bkg" app:layout_constraintBottom_toTopOf="@+id/module_entrance_id_move2_current_location" app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location" app:layout_goneMarginBottom="@dimen/module_ext_operation_panel_share_goneMarginBottom"> @@ -300,20 +303,22 @@ android:id="@+id/module_entrance_id_upload" android:layout_width="match_parent" android:layout_height="match_parent" - android:background="@drawable/module_ext_dw_upload_road_condition_bkg" android:gravity="center" android:text="@string/module_map_str_upload_road_condition" + tools:visibility="gone" android:textColor="#FFFFFF" android:textSize="@dimen/module_ext_operation_panel_share_textSize" /> @@ -334,7 +339,7 @@ android:text="前方\n实况" android:textColor="#FFFFFF" android:textSize="@dimen/module_ext_navi_exit_textSize" - android:visibility="visible" /> + android:visibility="gone" /> + android:visibility="gone" /> + android:visibility="gone" /> \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml b/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml deleted file mode 100644 index 729703ad4e..0000000000 --- a/modules/mogo-module-extensions/src/main/res/layout/module_map_layout_navi_info_panel_2.xml +++ /dev/null @@ -1,196 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml index 6ee10cc338..e2f012b564 100644 --- a/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-ldpi/dimens.xml @@ -90,8 +90,8 @@ 32px 7px 5px - 40px - 15px + 22px + 18px 24px 15px @@ -130,4 +130,7 @@ 16px 14px 14px + 18px + 58px + 58px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml index b936d0a5eb..173199225f 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml @@ -127,5 +127,8 @@ 30px 22px 28px + 30px + 90px + 90px \ No newline at end of file diff --git a/modules/mogo-module-extensions/src/main/res/values/dimens.xml b/modules/mogo-module-extensions/src/main/res/values/dimens.xml index d4922bc498..dbd4d79f5a 100644 --- a/modules/mogo-module-extensions/src/main/res/values/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values/dimens.xml @@ -124,5 +124,8 @@ 30px 22px 28px + 30px + 90px + 90px \ No newline at end of file diff --git a/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml index 08a1055bcc..a35cb8952b 100644 --- a/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml +++ b/modules/mogo-module-main/src/main/res/drawable/module_main_dw_left_frame_bkg.xml @@ -4,10 +4,7 @@ diff --git a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml index 0ba4ec9f22..c6ee43fbfb 100644 --- a/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-ldpi/dimens.xml @@ -1,7 +1,7 @@ - 300px + 200px 8px 352px 370px diff --git a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml index ee84bb8039..4d1f9fdb5b 100644 --- a/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values-xhdpi/dimens.xml @@ -1,7 +1,7 @@ - 300px + 200px 10px 660px 690px diff --git a/modules/mogo-module-main/src/main/res/values/dimens.xml b/modules/mogo-module-main/src/main/res/values/dimens.xml index af1335b972..878f4eb149 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -1,7 +1,7 @@ - 150px + 110px 10px 660px 690px diff --git a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java index 4e85df77c6..a8cd717cde 100644 --- a/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java +++ b/modules/mogo-module-service/src/main/java/com/mogo/module/service/marker/MapMarkerManager.java @@ -18,6 +18,7 @@ import com.mogo.module.common.entity.MarkerOnlineCar; import com.mogo.module.common.entity.MarkerResponse; import com.mogo.module.common.entity.MarkerShareMusic; import com.mogo.module.common.entity.MarkerShowEntity; +import com.mogo.module.common.utils.CarSeries; import com.mogo.module.service.MarkerServiceHandler; import com.mogo.module.service.ServiceConst; import com.mogo.module.service.Utils; @@ -147,8 +148,6 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( !mogoMarker.isDestroyed() ) { mogoMarker.setInfoWindowAdapter( UserDataMarkerInfoWindowAdapter.getInstance( mContext ) ); mogoMarker.showInfoWindow(); - MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus( TAG, true, false ); - MarkerServiceHandler.getMapUIController().moveToCenter( mogoMarker.getPosition() ); Logger.d( TAG, "打开info window" ); } } else { @@ -169,6 +168,8 @@ public class MapMarkerManager implements IMogoMarkerClickListener, mogoMarker.setToTop(); } } + MarkerServiceHandler.getMogoStatusManager().setUserInteractionStatus( TAG, true, false ); + MarkerServiceHandler.getMapUIController().moveToCenter( mogoMarker.getPosition(), CarSeries.getSeries() == CarSeries.CAR_SERIES_F80X ); } // 折叠气泡 diff --git a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml index 319576c88d..cb9fef8112 100644 --- a/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml +++ b/modules/mogo-module-service/src/main/res/layout/view_map_marker.xml @@ -6,6 +6,7 @@ android:layout_height="wrap_content" android:gravity="center" android:orientation="vertical" + android:padding="1px" tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + tools:parentTag="androidx.constraintlayout.widget.ConstraintLayout"> + app:layout_constraintTop_toTopOf="parent"> - + + app:layout_constraintTop_toBottomOf="@+id/clMarkerContent"> - + - \ No newline at end of file + \ No newline at end of file