From 6f3059ab9970fd480a369b2754e8ac2ea34c6a0d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 May 2021 15:27:20 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E6=8C=89=E7=85=A7=E8=81=94=E6=83=B3?= =?UTF-8?q?=E9=80=82=E9=85=8D=E6=96=B9=E6=A1=88=E4=B8=BA=20values-xhdpi-25?= =?UTF-8?q?60x1440=20drawable-xhdpi-2560x1440?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dimens.xml | 0 .../dimens.xml | 0 ...odule_mogo_och_base_icon_not_in_autopilot.png | Bin .../module_mogo_och_icon_arrived_station.png | Bin .../module_mogo_och_icon_arriving_station.png | Bin .../module_och_base_slide_block.png | Bin .../module_och_dot_line.png | Bin .../dimens.xml | 0 .../java/com/mogo/commons/mvp/MvpActivity.java | 15 +++++++++++++++ 9 files changed, 15 insertions(+) rename OCH/mogo-och-bus/src/main/res/{values-xhdpi-2560x1600 => values-xhdpi-2560x1440}/dimens.xml (100%) rename OCH/mogo-och-taxi/src/main/res/{values-xhdpi-2560x1600 => values-xhdpi-2560x1440}/dimens.xml (100%) rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_mogo_och_base_icon_not_in_autopilot.png (100%) rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_mogo_och_icon_arrived_station.png (100%) rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_mogo_och_icon_arriving_station.png (100%) rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_och_base_slide_block.png (100%) rename OCH/mogo-och/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_och_dot_line.png (100%) rename OCH/mogo-och/src/main/res/{values-xhdpi-2560x1600 => values-xhdpi-2560x1440}/dimens.xml (100%) 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){ } From 728b4bd2de0c0d5aff6535d222299166938fa9d0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= Date: Mon, 17 May 2021 16:27:17 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=9C=80=E4=BC=98?= =?UTF-8?q?=E8=BD=A6=E9=81=93=E6=8E=A8=E8=8D=90ui=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../module_v2x_vr_close.png | Bin .../v2x_optimal_route_warning.png | Bin .../v2x_road_front_car_warning.png | Bin .../v2x_road_front_dead_zone.png | Bin .../v2x_road_front_m_warning.png | Bin .../v2x_road_front_p_warning.png | Bin .../main/res/layout/vr_window_top_tips.xml | 2 +- .../src/main/res/values-ldpi/dimens.xml | 4 +- .../src/main/res/values-mdpi/dimens.xml | 4 +- .../res/values-xhdpi-2560x1440/dimens.xml | 5 + .../res/values-xhdpi-2560x1600/dimens.xml | 105 ------------------ .../src/main/res/values-xhdpi/dimens.xml | 4 +- 12 files changed, 12 insertions(+), 112 deletions(-) rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/module_v2x_vr_close.png (100%) rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_optimal_route_warning.png (100%) rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_car_warning.png (100%) rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_dead_zone.png (100%) rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_m_warning.png (100%) rename modules/mogo-module-v2x/src/main/res/{drawable-xhdpi-2560x1600 => drawable-xhdpi-2560x1440}/v2x_road_front_p_warning.png (100%) delete mode 100644 modules/mogo-module-v2x/src/main/res/values-xhdpi-2560x1600/dimens.xml 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 From 1b2feb6c47ca555477d0322d0b7310c07ca061c9 Mon Sep 17 00:00:00 2001 From: wujifei Date: Mon, 17 May 2021 16:49:33 +0800 Subject: [PATCH 3/3] =?UTF-8?q?new#=E4=BC=98=E5=8C=96=E9=80=9F=E5=BA=A6?= =?UTF-8?q?=E8=A1=A8=E7=9B=98UI?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/mogo/module/extensions/view/ArcView.java | 10 ++++++---- .../src/main/res/values-xhdpi-2560x1440/dimens.xml | 3 +++ .../src/main/res/values-xhdpi/dimens.xml | 3 +++ 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java index df19dc6d38..fce75f2bc4 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/view/ArcView.java @@ -15,6 +15,8 @@ import android.view.View; import androidx.annotation.Nullable; +import com.mogo.module.extensions.R; + /** * created by wujifei on 2021/3/24 16:20 * describe: @@ -28,7 +30,7 @@ public class ArcView extends View { //圆弧颜色 private int mArcColor; //圆弧的画笔的宽度 - private float mStrokeWith = dp2px(10); + private float mStrokeWith = getResources().getDimension(R.dimen.module_ext_arcView_stroke_with); //文字描述的paint private Paint mTextPaint; @@ -73,11 +75,11 @@ public class ArcView extends View { mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.BOLD)); //绘制中心的数值 mTextPaint.getTextBounds(mValue, 0, mValue.length(), mRect); - canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2-10, mTextPaint); + canvas.drawText(mValue, getWidth() / 2, getHeight() / 2 + mRect.height() / 2 - 10, mTextPaint); mTextPaint.setTypeface(Typeface.defaultFromStyle(Typeface.NORMAL)); //绘制中心文字描述 - mTextPaint.setTextSize(dp2px(28)); + mTextPaint.setTextSize(getResources().getDimension(R.dimen.module_ext_arcView_des_text_size)); mTextPaint.getTextBounds(mDes, 0, mDes.length(), mRect); canvas.drawText(mDes, getWidth() / 2, getHeight() * 17 / 20 + mRect.height() / 2, mTextPaint); } @@ -116,7 +118,7 @@ public class ArcView extends View { //设置文本的对齐方式 mTextPaint.setTextAlign(Paint.Align.CENTER); //mTextPaint.setTextSize(getResources().getDimensionPixelSize(R.dimen.dp_12)); - mTextPaint.setTextSize(dp2px(80)); + mTextPaint.setTextSize(getResources().getDimension(R.dimen.module_ext_arcView_center_text_size)); } diff --git a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml index c4155f70f7..703c97c9a2 100644 --- a/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml +++ b/modules/mogo-module-extensions/src/main/res/values-xhdpi-2560x1440/dimens.xml @@ -5,4 +5,7 @@ 460px 320px 320px + 15px + 110px + 40px \ 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 67bc009a50..010482f882 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 @@ -187,5 +187,8 @@ 200px 200px + 10px + 80px + 28px \ No newline at end of file