diff --git a/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och-bus/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och-taxi/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_base_icon_not_in_autopilot.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_base_icon_not_in_autopilot.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arrived_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arrived_station.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_mogo_och_icon_arriving_station.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_mogo_och_icon_arriving_station.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_base_slide_block.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_base_slide_block.png
diff --git a/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png b/OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
similarity index 100%
rename from OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1600/module_och_dot_line.png
rename to OCH/mogo-och/src/main/res/drawable-xhdpi-2560x1440/module_och_dot_line.png
diff --git a/OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml b/OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
similarity index 100%
rename from OCH/mogo-och/src/main/res/values-xhdpi-2560x1600/dimens.xml
rename to OCH/mogo-och/src/main/res/values-xhdpi-2560x1440/dimens.xml
diff --git a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
index 8f165549a0..7e7bae038c 100644
--- a/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
+++ b/foudations/mogo-commons/src/main/java/com/mogo/commons/mvp/MvpActivity.java
@@ -1,8 +1,10 @@
package com.mogo.commons.mvp;
import android.content.Context;
+import android.os.Build;
import android.os.Bundle;
import android.view.MotionEvent;
+import android.view.View;
import android.view.Window;
import android.view.WindowManager;
@@ -28,6 +30,7 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
@Override
protected void onCreate( @Nullable Bundle savedInstanceState ) {
+ hideBottomUIMenu();
super.onCreate( savedInstanceState );
beforeSetContentView(savedInstanceState);
if ( DebugConfig.getCarMachineType() == DebugConfig.CAR_MACHINE_TYPE_BYD ) {
@@ -40,6 +43,18 @@ public abstract class MvpActivity< V extends IView, P extends Presenter< V > >
getLifecycle().addObserver( mPresenter );
}
+ //隐藏导航栏
+ protected void hideBottomUIMenu() {
+ //隐藏虚拟按键
+ if (Build.VERSION.SDK_INT >= 19) {
+ //for new api versions.
+ View decorView = getWindow().getDecorView();
+ int uiOptions = View.SYSTEM_UI_FLAG_HIDE_NAVIGATION
+ | View.SYSTEM_UI_FLAG_IMMERSIVE_STICKY ;
+ decorView.setSystemUiVisibility(uiOptions);
+ }
+ }
+
protected void beforeSetContentView(Bundle savedInstanceState){
}
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/module_v2x_vr_close.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/module_v2x_vr_close.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_optimal_route_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_optimal_route_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_car_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_car_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_dead_zone.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_dead_zone.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_m_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_m_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png b/modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
similarity index 100%
rename from modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1600/v2x_road_front_p_warning.png
rename to modules/mogo-module-v2x/src/main/res/drawable-xhdpi-2560x1440/v2x_road_front_p_warning.png
diff --git a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
index c99774a6e4..446e5c311e 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/vr_window_top_tips.xml
@@ -28,7 +28,7 @@
android:layout_marginRight="@dimen/dp_20"
android:text="为您推荐最优路线"
android:textColor="#FFFFFF"
- android:textSize="@dimen/dp_32"
+ android:textSize="@dimen/module_v2x_event_warning_type_text_size"
app:layout_constraintBottom_toBottomOf="@+id/warning_type_image"
app:layout_constraintEnd_toEndOf="parent"
app:layout_constraintStart_toEndOf="@+id/warning_type_image"
diff --git a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
index 2815a726e6..a7c7e3c3dd 100644
--- a/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml
@@ -101,8 +101,8 @@
19px
- 133px
- 42px
+ 100px
+ 32px
diff --git a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
index 2344ee5dea..af1575dcd3 100644
--- a/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml
@@ -101,8 +101,8 @@
19px
- 133px
- 42px
+ 100px
+ 32px
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
index e09973a74e..3213f45db8 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1440/dimens.xml
@@ -31,4 +31,9 @@
480px
42px
40px
+
+
+ 133px
+ 42px
+
\ No newline at end of file
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
deleted file mode 100644
index 1978407261..0000000000
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-
-
-
- 800px
-
- 32px
- 32px
-
- 390px
- 410px
-
-
- 160px
-
-
- 60px
- 40px
-
- 80px
-
- 778px
- 687px
- 200px
- 10px
- 487px
- 778px
-
- 15px
- 550px
- 200px
- 200px
- 100px
- 90px
- 162px
- 64px
- 80px
- 26px
- 270px
- 86px
- 58px
- 48px
- 48px
- 349px
- 465px
- 306px
- 77px
- 50px
- 28px
- 16px
- 5px
- 80px
- 22px
-
- 20px
- 30px
-
- 42px
- 30px
- 36px
- 30px
- 50px
-
- 120px
-
- 158px
-
-
- 20px
- 36px
- 28px
- 55px
- 36px
- 310px
- 110px
- 120px
-
-
- 270px
- 480px
- 330px
- 450px
-
-
- 200px
-
- 75px
- 32px
- 26px
- 80px
- 34px
-
-
- 133px
- 42px
-
-
-
- 940px
- 701px
- 150px
- 46px
- 26px
-
-
-
diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
index 8e83da6e51..9229a21b5a 100644
--- a/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
+++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml
@@ -117,8 +117,8 @@
34px
- 133px
- 42px
+ 100px
+ 32px