Merge remote-tracking branch 'origin/master'

moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt

@@ -75,7 +75,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
             } else {
                 holder.id_rl_new_people?.visibility = View.VISIBLE
                 holder.id_tv_new_people_price?.visibility = View.VISIBLE
-                holder.id_tv_new_people_price?.text = "$${bean.newUserPrice}"
+                holder.id_tv_new_people_price?.text = "${bean.newUserPrice}"
                 holder.id_tv_new_people_price?.getPaint()?.setFlags(Paint.STRIKE_THRU_TEXT_FLAG)
                 holder.id_new_user_box_tips?.text = "New user $${bean.discount} discount"
             }

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

@@ -14,10 +14,10 @@
         android:id="@+id/id_img_goods"
         android:layout_width="match_parent"
         android:layout_height="140dp"
-        android:layout_marginTop="30dp"
-        android:layout_marginBottom="20dp"
         android:layout_marginLeft="20dp"
+        android:layout_marginTop="30dp"
         android:layout_marginRight="20dp"
+        android:layout_marginBottom="20dp"
         android:adjustViewBounds="true" />
 
     <TextView
@@ -97,13 +97,14 @@
                     android:text="@string/reduce"
                     android:textColor="@color/white"
                     android:textSize="13sp"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
             </RelativeLayout>
 
             <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginBottom="5dp">
+                android:layout_marginBottom="5dp"
+                android:gravity="center_vertical">
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -111,7 +112,14 @@
                     android:text="$"
                     android:textColor="@color/color_4c84ff"
                     android:textSize="14sp"
-                    android:textStyle="bold" />
+                    android:textStyle="bold"
+                    android:visibility="gone" />
+
+                <ImageView
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:src="@drawable/icon_jinbi"
+                    android:layout_marginRight="5dp"/>
 
                 <TextView
                     android:id="@+id/id_tv_price"
@@ -129,7 +137,9 @@
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:textColor="@color/color_999999"
-                    android:textSize="14sp" />
+                    android:textSize="14sp"
+                    android:drawableLeft="@drawable/icon_jinbi"
+                    android:drawablePadding="5dp"/>
 
                 <TextView
                     android:id="@+id/id_tv_sales_volume"
@@ -153,6 +163,7 @@
                 android:paddingTop="1.5dp"
                 android:paddingRight="5dp"
                 android:paddingBottom="1.5dp">
+
                 <TextView
                     android:id="@+id/id_tv_baodi"
                     android:layout_width="wrap_content"
@@ -161,7 +172,8 @@
                     android:text="100%必中"
                     android:textColor="@color/color_4c84ff"
                     android:textSize="12sp"
-                    android:visibility="gone"/>
+                    android:visibility="gone" />
+
                 <TextView
                     android:id="@+id/id_tv_min_max_price"
                     android:layout_width="wrap_content"
@@ -171,8 +183,6 @@
                     android:textSize="12sp" />
 
 
-
-
             </LinearLayout>
         </LinearLayout>
 

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

@@ -30,7 +30,8 @@
                 android:text="@string/box_detail_open_box_money_unit"
                 android:textColor="@color/color_4C84FF"
                 android:textSize="14sp"
-                android:textStyle="bold" />
+                android:textStyle="bold"
+                android:visibility="gone"/>
 
             <TextView
                 android:id="@+id/id_tv_price"
@@ -40,6 +41,8 @@
                 android:layout_marginRight="5dp"
                 android:layout_weight="1"
                 android:includeFontPadding="false"
+                android:drawableLeft="@drawable/icon_jinbi"
+                android:drawablePadding="5dp"
                 android:text="10499"
                 android:textColor="@color/color_4C84FF"
                 android:textSize="22sp"