From a6e8bddbc7e2269a3e9aeaa6e2f858eafae6da62 Mon Sep 17 00:00:00 2001
From: tongchenfei <tongchenfei@zhidaoauto.com>
Date: Fri, 23 Oct 2020 18:49:56 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=88=86=E4=BA=AB=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E5=92=8C=E4=BA=8B=E4=BB=B6=E9=9D=A2=E6=9D=BF=E6=8C=89?=
 =?UTF-8?q?=E9=92=AE=E4=BD=8D=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../res/layout/module_ext_layout_entrance.xml | 67 +++++++++----------
 1 file changed, 31 insertions(+), 36 deletions(-)

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 2f6f5357dd..4baeb97ccd 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" />
@@ -138,41 +138,6 @@
         android:gravity="center" />
 
 
-    <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"
@@ -223,6 +188,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>