Merge remote-tracking branch 'origin/develop_1.1.1' into develop_1.1.1

moduleMain/src/main/java/com/zxbw/modulemain/activity/SearchActivity.kt

@@ -140,6 +140,7 @@ class SearchActivity : BaseActivity(), SearchContract.View,
 
         id_search_history_view.setOnTagClickListener { view, position ->
 //            JumpUtils.SearchReslutJumo(mData[position], "0", "")
+            JumpUtils.SearchReslutJumo(mData[position])
         }
 
     }

moduleMain/src/main/res/layout/activity_layout_search_reslut.xml

@@ -22,9 +22,9 @@
             android:id="@+id/id_rl_search"
             android:layout_width="wrap_content"
             android:layout_height="36dp"
+            android:layout_marginRight="20dp"
             android:layout_weight="1"
             android:background="@drawable/shape_9a6bf8_r20"
-            android:layout_marginRight="20dp"
             android:gravity="center_vertical"
             android:visibility="visible">
 
@@ -38,20 +38,82 @@
                 android:textColor="@color/color_333333"
                 android:textCursorDrawable="@drawable/cursor_color"
                 android:textSize="12sp" />
+
             <ImageView
                 android:id="@+id/id_img_clear"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentRight="true"
-                android:paddingRight="10dp"
-                android:paddingLeft="10dp"
                 android:layout_centerVertical="true"
-                android:src="@drawable/icon_search_shanchu"/>
+                android:paddingLeft="10dp"
+                android:paddingRight="10dp"
+                android:src="@drawable/icon_search_shanchu" />
         </RelativeLayout>
 
 
     </LinearLayout>
 
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="60dp"
+        android:gravity="center_vertical"
+        android:visibility="gone"
+        android:paddingLeft="16dp"
+        android:paddingRight="16dp">
+
+        <TextView
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:textStyle="bold"
+            android:text="综合"
+            android:textColor="@color/color_333333"
+            android:textSize="18sp" />
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="center">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="销量"
+                android:textColor="@color/color_999999"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:src="@drawable/icon_shaixuan" />
+        </LinearLayout>
+
+        <LinearLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1"
+            android:gravity="right|center_vertical">
+
+            <TextView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:text="到手价"
+                android:textColor="@color/color_999999"
+                android:textSize="18sp" />
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginLeft="4dp"
+                android:src="@drawable/icon_shaixuan" />
+        </LinearLayout>
+    </LinearLayout>
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:background="#EFEFEF"/>
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">