From 18a2d8e4e144d7ba926239ddf5bbbb71c40a77df Mon Sep 17 00:00:00 2001 From: wangcongtao Date: Fri, 27 Nov 2020 11:32:31 +0800 Subject: [PATCH] =?UTF-8?q?=E5=86=85=E5=AD=98=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../common/map/MapCenterPointStrategy.java | 93 ++++++++++++------- .../com/mogo/module/main/MainActivity.java | 5 +- .../res/layout/module_main_activity_main.xml | 1 + .../module_main_activity_main_no_map.xml | 1 + .../src/main/res/values/colors.xml | 2 +- .../main/module-main-res/values/colors.xml | 4 + 6 files changed, 69 insertions(+), 37 deletions(-) create mode 100644 skin/mogo-skin-light/src/main/module-main-res/values/colors.xml diff --git a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java index c117f81214..cebd8f8905 100644 --- a/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java +++ b/modules/mogo-module-common/src/main/java/com/mogo/module/common/map/MapCenterPointStrategy.java @@ -27,11 +27,13 @@ public class MapCenterPointStrategy { { // 选点场景，定位中心点 Map< String, MapCenterPoint > choosePoint = new HashMap<>(); - choosePoint.put( "d80x", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "em4", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "e8xx", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "f80x", new MapCenterPoint( 0.5D, 0.5D ) ); - choosePoint.put( "f8xx", new MapCenterPoint( 0.5D, 0.5D ) ); + final MapCenterPoint point = new MapCenterPoint( 0.5D, 0.5D ); + choosePoint.put( "d80x", point ); + choosePoint.put( "em4", point ); + choosePoint.put( "em3", point ); + choosePoint.put( "e8xx", point ); + choosePoint.put( "f80x", point ); + choosePoint.put( "f8xx", point ); sStrategies.put( Scene.CHOOSE_POINT, choosePoint ); } @@ -39,10 +41,13 @@ public class MapCenterPointStrategy { // 导航场景，定位视图右下角偏下 Map< String, MapCenterPoint > navi = new HashMap<>(); navi.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.573333333333D ) ); - navi.put( "em4", new MapCenterPoint( 0.734375D, 0.573333333333D ) ); - navi.put( "e8xx", new MapCenterPoint( 0.734375D, 0.573333333333D ) ); - navi.put( "f80x", new MapCenterPoint( 0.705208333D, 0.575D ) ); - navi.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.575D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.573333333333D ); + navi.put( "em4", em4 ); + navi.put( "em3", em4 ); + navi.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.575D ); + navi.put( "f80x", f80x ); + navi.put( "f8xx", f80x ); sStrategies.put( Scene.NAVI, navi ); } @@ -50,10 +55,13 @@ public class MapCenterPointStrategy { // 导航场景 vs 道路事件展示场景，定位视图右下角偏下 Map< String, MapCenterPoint > naviWithRoadEvent = new HashMap<>(); naviWithRoadEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.73936170212766D ) ); - naviWithRoadEvent.put( "em4", new MapCenterPoint( 0.734375D, 0.73936170212766D ) ); - naviWithRoadEvent.put( "e8xx", new MapCenterPoint( 0.734375D, 0.73936170212766D ) ); - naviWithRoadEvent.put( "f80x", new MapCenterPoint( 0.705208333D, 0.683333333333D ) ); - naviWithRoadEvent.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.683333333333D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.73936170212766D ); + naviWithRoadEvent.put( "em4", em4 ); + naviWithRoadEvent.put( "em3", em4 ); + naviWithRoadEvent.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.683333333333D ); + naviWithRoadEvent.put( "f80x", f80x ); + naviWithRoadEvent.put( "f8xx", f80x ); sStrategies.put( Scene.NAVI_WITH_ROAD_EVENT, naviWithRoadEvent ); } @@ -61,10 +69,13 @@ public class MapCenterPointStrategy { // 巡航场景 Map< String, MapCenterPoint > aimless = new HashMap<>(); aimless.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.5D ) ); - aimless.put( "em4", new MapCenterPoint( 0.734375D, 0.5D ) ); - aimless.put( "e8xx", new MapCenterPoint( 0.734375D, 0.5D ) ); - aimless.put( "f80x", new MapCenterPoint( 0.705208333D, 0.5D ) ); - aimless.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.5D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.5D ); + aimless.put( "em4", em4 ); + aimless.put( "em3", em4 ); + aimless.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.5D ); + aimless.put( "f80x", f80x ); + aimless.put( "f8xx", f80x ); sStrategies.put( Scene.AIMLESS, aimless ); } @@ -72,32 +83,41 @@ public class MapCenterPointStrategy { // 巡航场景 vs 道路事件展示场景 Map< String, MapCenterPoint > aimlessWithRoadEvent = new HashMap<>(); aimlessWithRoadEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.68617 ) ); - aimlessWithRoadEvent.put( "em4", new MapCenterPoint( 0.734375D, 0.68617 ) ); - aimlessWithRoadEvent.put( "e8xx", new MapCenterPoint( 0.734375D, 0.68617 ) ); - aimlessWithRoadEvent.put( "f80x", new MapCenterPoint( 0.705208333D, 0.599074074D ) ); - aimlessWithRoadEvent.put( "f8xx", new MapCenterPoint( 0.705208333D, 0.599074074D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.734375D, 0.68617 ); + aimlessWithRoadEvent.put( "em4", em4 ); + aimlessWithRoadEvent.put( "em3", em4 ); + aimlessWithRoadEvent.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.705208333D, 0.599074074D ); + aimlessWithRoadEvent.put( "f80x", f80x ); + aimlessWithRoadEvent.put( "f8xx", f80x ); sStrategies.put( Scene.AIMLESS_WITH_ROAD_EVENT, aimlessWithRoadEvent ); } { // 规划路线，定位视图右边 Map< String, MapCenterPoint > calculatePath = new HashMap<>(); - calculatePath.put( "d80x", new MapCenterPoint( 0.733398D, 0.610833D ) ); - calculatePath.put( "em4", new MapCenterPoint( 0.733398D, 0.610833D ) ); - calculatePath.put( "e8xx", new MapCenterPoint( 0.733398D, 0.610833D ) ); - calculatePath.put( "f80x", new MapCenterPoint( 0.703125D, 0.6083333D ) ); - calculatePath.put( "f8xx", new MapCenterPoint( 0.703125D, 0.6083333D ) ); + final MapCenterPoint d80x = new MapCenterPoint( 0.733398D, 0.610833D ); + calculatePath.put( "d80x", d80x ); + calculatePath.put( "em4", d80x ); + calculatePath.put( "em3", d80x ); + calculatePath.put( "e8xx", d80x ); + final MapCenterPoint f80x = new MapCenterPoint( 0.703125D, 0.6083333D ); + calculatePath.put( "f80x", f80x ); + calculatePath.put( "f8xx", f80x ); sStrategies.put( Scene.CALCULATE_PATH, calculatePath ); } { // 分类搜索，定位视图右边 Map< String, MapCenterPoint > categorySearch = new HashMap<>(); - categorySearch.put( "d80x", new MapCenterPoint( 0.733398D, 0.5D ) ); - categorySearch.put( "em4", new MapCenterPoint( 0.733398D, 0.5D ) ); - categorySearch.put( "e8xx", new MapCenterPoint( 0.733398D, 0.5D ) ); - categorySearch.put( "f80x", new MapCenterPoint( 0.733594D, 0.5D ) ); - categorySearch.put( "f8xx", new MapCenterPoint( 0.733594D, 0.5D ) ); + final MapCenterPoint d80x = new MapCenterPoint( 0.733398D, 0.5D ); + categorySearch.put( "d80x", d80x ); + categorySearch.put( "em4", d80x ); + categorySearch.put( "em3", d80x ); + categorySearch.put( "e8xx", d80x ); + final MapCenterPoint f80x = new MapCenterPoint( 0.733594D, 0.5D ); + categorySearch.put( "f80x", f80x ); + categorySearch.put( "f8xx", f80x ); sStrategies.put( Scene.CATEGORY_SEARCH, categorySearch ); } @@ -105,10 +125,13 @@ public class MapCenterPointStrategy { // V2X，场景视图右边 Map< String, MapCenterPoint > categoryV2XEvent = new HashMap<>(); categoryV2XEvent.put( "d80x", new MapCenterPoint( 0.669444444444444, 0.7D ) ); - categoryV2XEvent.put( "em4", new MapCenterPoint( 0.677734375D, 0.7D ) ); - categoryV2XEvent.put( "e8xx", new MapCenterPoint( 0.677734375D, 0.7D ) ); - categoryV2XEvent.put( "f80x", new MapCenterPoint( 0.6963541D, 0.65D ) ); - categoryV2XEvent.put( "f8xx", new MapCenterPoint( 0.6963541D, 0.65D ) ); + final MapCenterPoint em4 = new MapCenterPoint( 0.677734375D, 0.7D ); + categoryV2XEvent.put( "em4", em4 ); + categoryV2XEvent.put( "em3", em4 ); + categoryV2XEvent.put( "e8xx", em4 ); + final MapCenterPoint f80x = new MapCenterPoint( 0.6963541D, 0.65D ); + categoryV2XEvent.put( "f80x", f80x ); + categoryV2XEvent.put( "f8xx", f80x ); sStrategies.put( Scene.CATEGORY_V2X_EVENT, categoryV2XEvent ); } } diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java index d20907333f..46803b3758 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java @@ -233,7 +233,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme @Override public void hideCoverUpLayout() { - Logger.d( TAG, "隐藏遮罩" ); + getWindow().setBackgroundDrawable( null ); mCoverUpLayout.setVisibility( View.GONE ); mServiceApis.getAdasControllerApi().showADAS(); } @@ -314,6 +314,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme protected void onStop() { super.onStop(); mMogoStatusManager.setMainPageIsBackgroundStatus( TAG, true ); + if ( shouldCloseADASPanelWhenPause() ) { + mServiceApis.getAdasControllerApi().closeADAS(); + } } @Override diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml index 47c99c83a9..677fca5348 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml @@ -2,6 +2,7 @@ diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml index c88a2f274b..ab6f0b3fa0 100644 --- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml +++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main_no_map.xml @@ -3,6 +3,7 @@ xmlns:tools="http://schemas.android.com/tools" android:layout_width="match_parent" android:layout_height="match_parent" + android:background="@color/module_main_window_background_color" android:orientation="vertical"> diff --git a/modules/mogo-module-main/src/main/res/values/colors.xml b/modules/mogo-module-main/src/main/res/values/colors.xml index 1a06e26bf7..639b257173 100644 --- a/modules/mogo-module-main/src/main/res/values/colors.xml +++ b/modules/mogo-module-main/src/main/res/values/colors.xml @@ -1,4 +1,4 @@ - #1D1D1D + #212831 \ No newline at end of file diff --git a/skin/mogo-skin-light/src/main/module-main-res/values/colors.xml b/skin/mogo-skin-light/src/main/module-main-res/values/colors.xml new file mode 100644 index 0000000000..e9887e80f1 --- /dev/null +++ b/skin/mogo-skin-light/src/main/module-main-res/values/colors.xml @@ -0,0 +1,4 @@ + + + #f7f7ff + \ No newline at end of file