修改分享按钮和事件面板按钮位置

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) {

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" />
 
-    <FrameLayout
-        android:id="@+id/module_entrance_id_upload_road_condition"
-        android:layout_width="@dimen/module_ext_operation_panel_share_width"
-        android:layout_height="@dimen/module_ext_operation_panel_share_height"
-        android:layout_marginBottom="@dimen/module_ext_operation_panel_share_marginBottom"
-        android:layout_marginEnd="@dimen/module_common_shadow_width_pos"
-        android:background="@drawable/module_ext_dw_upload_road_condition_bkg"
-        app:layout_constraintBottom_toTopOf="@+id/module_entrance_id_move2_current_location"
-        app:layout_constraintRight_toRightOf="@+id/module_entrance_id_move2_current_location"
-        app:layout_goneMarginBottom="@dimen/module_ext_operation_panel_share_goneMarginBottom">
-
-        <TextView
-            android:id="@+id/module_entrance_id_upload"
-            android:layout_width="match_parent"
-            android:layout_height="match_parent"
-            android:gravity="center"
-            android:text="@string/module_map_str_upload_road_condition"
-            android:textColor="#FFFFFF"
-            android:textSize="@dimen/module_ext_operation_panel_share_textSize"
-            android:textStyle="bold"
-            tools:visibility="gone" />
-
-        <ImageView
-            android:id="@+id/module_entrance_id_uploading"
-            android:layout_width="@dimen/module_entrance_id_uploading_width"
-            android:layout_height="@dimen/module_entrance_id_uploading_height"
-            android:layout_gravity="center"
-            android:gravity="center"
-            android:scaleType="fitCenter"
-            android:src="@drawable/module_ext_ic_uploading_00010"
-            android:textColor="#FFFFFF"
-            android:visibility="gone"
-            tools:visibility="visible" />
-    </FrameLayout>
-
     <LinearLayout
         android:id="@+id/module_entrance_id_buttons_container"
         android:layout_width="wrap_content"
@@ -196,6 +161,36 @@
             android:textStyle="bold"
             android:visibility="gone"
             tools:visibility="visible" />
+
+        <FrameLayout
+            android:id="@+id/module_entrance_id_upload_road_condition"
+            android:layout_marginTop="@dimen/module_entrance_id_button_marginTop"
+            android:layout_width="@dimen/module_ext_operation_panel_share_width"
+            android:layout_height="@dimen/module_ext_operation_panel_share_height"
+            android:background="@drawable/module_ext_dw_upload_road_condition_bkg">
+            <TextView
+                android:id="@+id/module_entrance_id_upload"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
+                android:gravity="center"
+                android:text="@string/module_map_str_upload_road_condition"
+                android:textColor="#FFFFFF"
+                android:textSize="@dimen/module_ext_operation_panel_share_textSize"
+                android:textStyle="bold"
+                tools:visibility="gone" />
+
+            <ImageView
+                android:id="@+id/module_entrance_id_uploading"
+                android:layout_width="@dimen/module_entrance_id_uploading_width"
+                android:layout_height="@dimen/module_entrance_id_uploading_height"
+                android:layout_gravity="center"
+                android:gravity="center"
+                android:scaleType="fitCenter"
+                android:src="@drawable/module_ext_ic_uploading_00010"
+                android:textColor="#FFFFFF"
+                android:visibility="gone"
+                tools:visibility="visible" />
+        </FrameLayout>
     </LinearLayout>
 
 

modules/mogo-module-extensions/src/main/res/values-xhdpi/dimens.xml

@@ -145,7 +145,7 @@
     <dimen name="module_ext_display_overview_icon_marginTop">20px</dimen>
 
     <dimen name="module_ext_top_over_navi_height">34px</dimen>
-    <dimen name="module_ext_notice_margin_start">161px</dimen>
+    <dimen name="module_ext_notice_margin_start">10px</dimen>
     <dimen name="module_ext_weather_margin_start">10px</dimen>
     <dimen name="module_ext_msg_counter_margin">45px</dimen>
     <dimen name="module_ext_user_avator_size">120px</dimen>

modules/mogo-module-main/src/main/res/values/dimens.xml

@@ -26,6 +26,6 @@
     <dimen name="module_main_entrance_fragment_container_padding_top">16px</dimen>
     <dimen name="module_main_entrance_fragment_container_width">658px</dimen>
     <dimen name="module_event_fragment_container_padding">8px</dimen>
-    <dimen name="module_main_apps_fragment_container_paddingTop">2px</dimen>
+    <dimen name="module_main_apps_fragment_container_paddingTop">8px</dimen>
 
 </resources>

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 : MvpFragment<V2XEventPanelFragment, EventPanelPrese
                     }
                 }
             }
+            val x = resources.getDimensionPixelSize(if (DebugConfig.isLauncher()) {
+                R.dimen.module_v2x_event_panel_in_launcher_btn_x
+            } else {
+                R.dimen.module_v2x_event_panel_btn_x
+            })
+            val y = resources.getDimensionPixelSize(R.dimen.module_v2x_event_panel_btn_y)
             V2XServiceManager.getMogoEntranceButtonController()
-                    .addBottomLayerView(mV2XEventPanelHistoryCountView)
+                    .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
             changeEventCount()
         } catch (e: Exception) {
             e.printStackTrace()

modules/mogo-module-v2x/src/main/res/values-ldpi/dimens.xml

@@ -99,4 +99,7 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
+    <dimen name="module_v2x_event_panel_btn_x">572px</dimen>
+    <dimen name="module_v2x_event_panel_in_launcher_btn_x">480px</dimen>
+    <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
 </resources>

modules/mogo-module-v2x/src/main/res/values-mdpi/dimens.xml

@@ -100,4 +100,8 @@
     <dimen name="module_v2x_event_parking_text_size">19px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
+    <dimen name="module_v2x_event_panel_btn_x">574px</dimen>
+    <dimen name="module_v2x_event_panel_in_launcher_btn_x">480px</dimen>
+    <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
+
 </resources>

modules/mogo-module-v2x/src/main/res/values-xhdpi-1920x1000/dimens.xml

@@ -82,4 +82,6 @@
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
+    <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
+    <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
 </resources>

modules/mogo-module-v2x/src/main/res/values-xhdpi/dimens.xml

@@ -97,5 +97,8 @@
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
+    <dimen name="module_v2x_event_panel_btn_x">940px</dimen>
+    <dimen name="module_v2x_event_panel_in_launcher_btn_x">940px</dimen>
+    <dimen name="module_v2x_event_panel_btn_y">701px</dimen>
 
 </resources>

modules/mogo-module-v2x/src/main/res/values/dimens.xml

@@ -90,4 +90,7 @@
     <dimen name="module_v2x_event_parking_text_size">34px</dimen>
     <!--适配 V2X 弹窗 UI-->
 
+    <dimen name="module_v2x_event_panel_btn_x">574px</dimen>
+    <dimen name="module_v2x_event_panel_in_launcher_btn_x">480px</dimen>
+    <dimen name="module_v2x_event_panel_btn_y">384px</dimen>
 </resources>