diff --git a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java index 7e8670189e..da48584d37 100644 --- a/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java +++ b/modules/mogo-module-extensions/src/main/java/com/mogo/module/extensions/utils/EntranceViewHolder.java @@ -1,5 +1,6 @@ package com.mogo.module.extensions.utils; +import android.graphics.Color; import android.view.View; import android.view.ViewGroup; import android.widget.FrameLayout; @@ -90,6 +91,7 @@ public class EntranceViewHolder { View v = wrapper.getView(); v.setLayoutParams(params); rootViewGroup.addView(v, 0); +// rootViewGroup.setBackgroundColor(Color.WHITE); } public void removeBottomLayerView(View view) { 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 aa9282f3a5..290f28af62 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 @@ -31,7 +31,7 @@ android:textSize="@dimen/module_ext_north_textSize" android:textStyle="bold" android:visibility="gone" - app:layout_constraintRight_toRightOf="@+id/module_entrance_id_upload_road_condition" + app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location" app:layout_constraintTop_toBottomOf="@+id/module_map_id_navi_bg" app:layout_goneMarginTop="@dimen/module_ext_north_goneMarginTop" tools:visibility="visible" /> @@ -111,41 +111,6 @@ app:layout_constraintBottom_toBottomOf="parent" app:layout_constraintRight_toRightOf="parent" /> - - - - - - - + + + + + + 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 125e839721..2fec4e02b2 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 @@ -145,7 +145,7 @@ 20px 34px - 161px + 10px 10px 45px 120px 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 707ac832c0..86cd80d7b8 100644 --- a/modules/mogo-module-main/src/main/res/values/dimens.xml +++ b/modules/mogo-module-main/src/main/res/values/dimens.xml @@ -26,6 +26,6 @@ 16px 658px 8px - 2px + 8px \ No newline at end of file diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt index 0e5f343eb1..1680b06794 100644 --- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt +++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt @@ -10,6 +10,7 @@ import androidx.constraintlayout.widget.ConstraintLayout import androidx.fragment.app.Fragment import androidx.viewpager2.widget.ViewPager2 import com.google.android.material.tabs.TabLayoutMediator +import com.mogo.commons.debug.DebugConfig import com.mogo.commons.mvp.MvpFragment import com.mogo.module.v2x.R import com.mogo.module.v2x.V2XConst.MODULE_NAME @@ -177,8 +178,14 @@ class V2XEventPanelFragment : MvpFragment19px + 572px + 480px + 384px 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 17684331f1..3af13f8c79 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 @@ -100,4 +100,8 @@ 19px + 574px + 480px + 384px + diff --git a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml index 4d5042d290..e82f40ef3b 100644 --- a/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml @@ -82,4 +82,6 @@ 34px + 940px + 701px 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 e68401f90f..37c004aa56 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 @@ -97,5 +97,8 @@ 34px + 940px + 940px + 701px diff --git a/modules/mogo-module-v2x/src/main/res/values/dimens.xml b/modules/mogo-module-v2x/src/main/res/values/dimens.xml index 4a3513818b..e42cbc11b1 100644 --- a/modules/mogo-module-v2x/src/main/res/values/dimens.xml +++ b/modules/mogo-module-v2x/src/main/res/values/dimens.xml @@ -90,4 +90,7 @@ 34px + 574px + 480px + 384px