Merge branch 'developer' of https://gitlab.com/Arisono/SkWeiChat-Baidu into feature

app_modular/appworks/src/main/res/layout/activity_business_manage_home.xml

@@ -64,20 +64,21 @@
                         android:textSize="12sp" />
                 </LinearLayout>
 
+
                 <LinearLayout
-                    android:id="@+id/business_manage_home_distribution_ll"
+                    android:id="@+id/business_manage_home_funnel_ll"
                     style="@style/business_manage_header_item">
 
                     <ImageView
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:src="@drawable/ic_business_header_distribution" />
+                        android:src="@drawable/ic_business_header_funnel" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
-                        android:text="商机分配"
+                        android:text="商机漏斗"
                         android:textColor="#333333"
                         android:textSize="12sp" />
                 </LinearLayout>
@@ -86,18 +87,6 @@
                     android:id="@+id/business_manage_home_grap_ll"
                     style="@style/business_manage_header_item">
 
-                    <ImageView
-                        android:layout_width="40dp"
-                        android:layout_height="40dp"
-                        android:src="@drawable/ic_business_header_race" />
-
-                    <TextView
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:layout_marginTop="6dp"
-                        android:text="抢占商机"
-                        android:textColor="#333333"
-                        android:textSize="12sp" />
                 </LinearLayout>
 
             </LinearLayout>
@@ -109,28 +98,42 @@
                 android:paddingBottom="10dp"
                 android:paddingLeft="10dp"
                 android:paddingRight="10dp"
-                android:paddingTop="0dp">
+                android:paddingTop="0dp"
+                android:visibility="gone">
 
                 <LinearLayout
-                    android:id="@+id/business_manage_home_funnel_ll"
+                    android:id="@+id/business_manage_home_distribution_ll"
                     style="@style/business_manage_header_item">
 
                     <ImageView
                         android:layout_width="40dp"
                         android:layout_height="40dp"
-                        android:src="@drawable/ic_business_header_funnel" />
+                        android:src="@drawable/ic_business_header_distribution" />
 
                     <TextView
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_marginTop="6dp"
-                        android:text="商机漏斗"
+                        android:text="商机分配"
                         android:textColor="#333333"
                         android:textSize="12sp" />
                 </LinearLayout>
 
                 <LinearLayout
                     style="@style/business_manage_header_item">
+
+                    <ImageView
+                        android:layout_width="40dp"
+                        android:layout_height="40dp"
+                        android:src="@drawable/ic_business_header_race" />
+
+                    <TextView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:layout_marginTop="6dp"
+                        android:text="抢占商机"
+                        android:textColor="#333333"
+                        android:textSize="12sp" />
                 </LinearLayout>
 
                 <LinearLayout