diff --git a/app/build.gradle b/app/build.gradle index 0ef830f124..aab226de34 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -109,6 +109,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } // e系列,采用Launcher方案 e8xx { @@ -118,6 +119,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } // 同上 em4 { @@ -127,6 +129,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } // e系列-2+32,对标D系列2+32,采用独立app的形式 em3 { @@ -136,6 +139,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // e系列-1+16,对标D系列1+16,采用独立app形式 em1 { @@ -145,6 +149,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // d系列 d8xx { @@ -154,6 +159,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // d系列 1+16 版本 d82x{ @@ -163,6 +169,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'true' // 车机类型,主要用于区分自研车机还是别人家的车机,自研车机类型为0 buildConfigField 'int', 'CAR_MACHINE_TYPE', '0' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'false' } // 比亚迪 bydauto{ @@ -172,6 +179,7 @@ android { buildConfigField 'boolean', 'AI_ASSIST_ACTIVE_STAUTS', 'false' // 车机类型,主要用于区分自研车机还是别人家的车机,其他车机,比亚迪定为1 buildConfigField 'int', 'CAR_MACHINE_TYPE', '1' + buildConfigField 'boolean', 'ROAD_EVENT_ANIMATED', 'true' } qa { dimension "env" diff --git a/app/src/main/java/com/mogo/launcher/MogoApplication.java b/app/src/main/java/com/mogo/launcher/MogoApplication.java index 449ebf20d4..2fd042befb 100644 --- a/app/src/main/java/com/mogo/launcher/MogoApplication.java +++ b/app/src/main/java/com/mogo/launcher/MogoApplication.java @@ -95,6 +95,7 @@ public class MogoApplication extends AbsMogoApplication { DebugConfig.setCarMachineType( BuildConfig.CAR_MACHINE_TYPE ); DebugConfig.setProductFlavor( BuildConfig.FLAVOR_product ); DebugConfig.setSocketAppId( BuildConfig.SOCKET_APP_ID ); + DebugConfig.setRoadEventAnimated( BuildConfig.ROAD_EVENT_ANIMATED ); } @Override diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java index fff915fbb3..ebf76b2850 100644 --- a/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java +++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/debug/DebugConfig.java @@ -237,4 +237,17 @@ public class DebugConfig { public static String getSocketAppId() { return sSocketAppId; } + + /** + * 道路事件动画 + */ + private static boolean sRoadEventAnimated = false; + + public static boolean isRoadEventAnimated() { + return sRoadEventAnimated; + } + + public static void setRoadEventAnimated( boolean sRoadEventAnimated ) { + DebugConfig.sRoadEventAnimated = sRoadEventAnimated; + } } diff --git a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml index b06ddec62c..9390eafe8c 100644 --- a/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml +++ b/modules/mogo-module-search/src/main/res/layout/fragment_navi_setting.xml @@ -5,9 +5,7 @@ android:layout_height="match_parent" android:background="#2D2E3D" android:clickable="true" - android:orientation="vertical" - - > + android:orientation="vertical"> + android:textSize="@dimen/module_search_title_textSize" /> @@ -44,8 +42,8 @@ android:layout_width="match_parent" android:layout_height="0dp" android:overScrollMode="never" - android:paddingLeft="@dimen/module_search_dp_160" - android:paddingRight="@dimen/module_search_dp_160" + android:paddingLeft="@dimen/module_search_setting_container_padding" + android:paddingRight="@dimen/module_search_setting_container_padding" android:scrollbars="none" app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintTop_toBottomOf="@+id/rl_navi_setting_title"> @@ -53,12 +51,12 @@ + android:paddingBottom="@dimen/module_search_setting_container_paddingBottom"> @@ -105,18 +105,18 @@ android:id="@+id/rv_navi_history" android:layout_width="match_parent" android:layout_height="match_parent" - android:layout_marginTop="@dimen/module_search_dp_60" /> + android:layout_marginTop="@dimen/module_search_histories_inner_list_marginTop" /> - - 32px + 20px + 32px 32px 640px 64px @@ -19,32 +20,31 @@ 64px 16px 18px - 38px - 75px + 38px 40px - 410px - 640px - 16px - 20px - 30px - 20px - 28px - 144px - 126px - 96px - 42px - 38px - 28px - 23px - 96px - 69px - 192px - 64px + 410px + 640px + 16px + 20px + 30px + 20px + 28px + 144px + 126px + 96px + 42px + 38px + 28px + 23px + 96px + 69px + 192px + 64px 24px - 446px + 446px 83px - 56px - 100px + 56px + 100px 18px 111px 16px diff --git a/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml index 1d9cb352ae..a1fda384ff 100644 --- a/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values-mdpi/dimens.xml @@ -2,7 +2,8 @@ - 32px + 20px + 32px 32px 640px 64px @@ -19,32 +20,31 @@ 64px 16px 18px - 38px - 75px + 38px 40px - 410px - 640px - 16px - 20px - 30px - 20px - 28px - 144px - 126px - 96px - 42px - 38px - 28px - 23px - 96px - 69px - 192px - 64px + 410px + 640px + 16px + 20px + 30px + 20px + 28px + 144px + 126px + 96px + 42px + 38px + 28px + 23px + 96px + 69px + 192px + 64px 24px - 446px + 446px 83px - 56px - 100px + 56px + 100px 18px 111px 16px diff --git a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml index 7405ab41e0..deb82754dc 100644 --- a/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values-xhdpi/dimens.xml @@ -2,16 +2,16 @@ @dimen/sp_32 - @dimen/sp_40 - 25sp - @dimen/dp_60 - @dimen/dp_40 + 40px + 50px + 60px + 40px 600dp - @dimen/dp_120 - @dimen/dp_80 - @dimen/dp_24 - @dimen/dp_20 - @dimen/dp_50 + 120px + 80px + 24px + 20px + 50px 40px 266px 8px @@ -21,29 +21,28 @@ 120px 32px 75px - 72px - 75px - 778px - 1200px - 32px - 40px - 60px - 37px - 268px - 236px - 180px - 80px - 70px - 25sp - 42px - 160px - 150px - 180dp - 120px + 72px + 778px + 1200px + 32px + 40px + 60px + 37px + 268px + 236px + 180px + 80px + 70px + 25px + 42px + 160px + 150px + 180dp + 120px 45px - 838px + 838px 184px - 104px + 104px 154px 32px 212px diff --git a/modules/mogo-module-search/src/main/res/values/dimens.xml b/modules/mogo-module-search/src/main/res/values/dimens.xml index a06368577c..deb82754dc 100644 --- a/modules/mogo-module-search/src/main/res/values/dimens.xml +++ b/modules/mogo-module-search/src/main/res/values/dimens.xml @@ -1,17 +1,17 @@ + @dimen/sp_32 - @dimen/dp_60 - @dimen/sp_40 - 25sp - @dimen/dp_60 - @dimen/dp_40 + 40px + 50px + 60px + 40px 600dp - @dimen/dp_120 - @dimen/dp_80 - @dimen/dp_24 - @dimen/dp_20 - @dimen/dp_50 + 120px + 80px + 24px + 20px + 50px 40px 266px 8px @@ -21,29 +21,28 @@ 120px 32px 75px - 72px - 75px - 778px - 1200px - 32px - 40px - 60px - 37px - 268px - 236px - 180px - 80px - 70px - 25sp - 42px - 160px - 150px - 180dp - 120px + 72px + 778px + 1200px + 32px + 40px + 60px + 37px + 268px + 236px + 180px + 80px + 70px + 25px + 42px + 160px + 150px + 180dp + 120px 45px - 838px - 142px - 104px + 838px + 184px + 104px 154px 32px 212px diff --git a/modules/mogo-module-search/src/main/res/values/styles.xml b/modules/mogo-module-search/src/main/res/values/styles.xml index a3f67638ff..c7a295ef43 100644 --- a/modules/mogo-module-search/src/main/res/values/styles.xml +++ b/modules/mogo-module-search/src/main/res/values/styles.xml @@ -17,29 +17,29 @@ 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 f641febd03..771e3c1850 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 @@ -373,7 +373,11 @@ public class MapMarkerManager implements IMogoMarkerClickListener, if ( mogoMarker == null || mogoMarker.isDestroyed() ) { Logger.d( TAG, "draw road condition, sn = %s", sn ); try { - post2AddAndStartAnimation( markerShowEntity, i * 100L ); + if ( DebugConfig.isRoadEventAnimated() ) { + post2AddAndStartAnimation( markerShowEntity, i * 100L ); + } else { + mogoMarker = drawMapMarker( markerShowEntity, ServiceConst.MARKER_Z_INDEX_HIGH ); + } } catch ( Exception e ) { e.printStackTrace(); }