Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Sign in / Register
Toggle navigation
M
magicbox
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Packages
Packages
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
王雪伟
magicbox
Commits
61cfec4a
Commit
61cfec4a
authored
Mar 17, 2022
by
maxiaoliang
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
11
parent
5a0e07b5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
11 deletions
+24
-11
BoxAdapter.kt
...in/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt
+1
-1
item_layout_new_box.xml
moduleMain/src/main/res/layout/item_layout_new_box.xml
+19
-9
layout_detail_content2.xml
moduleMain/src/main/res/layout/layout_detail_content2.xml
+4
-1
No files found.
moduleMain/src/main/java/com/zxhl/main/page/adapter/BoxAdapter.kt
View file @
61cfec4a
...
@@ -75,7 +75,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
...
@@ -75,7 +75,7 @@ class BoxAdapter : BaseRecyclerAdapter<HomeBoxListEntity, RecyclerView.ViewHolde
}
else
{
}
else
{
holder
.
id_rl_new_people
?.
visibility
=
View
.
VISIBLE
holder
.
id_rl_new_people
?.
visibility
=
View
.
VISIBLE
holder
.
id_tv_new_people_price
?.
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_tv_new_people_price
?.
getPaint
()
?.
setFlags
(
Paint
.
STRIKE_THRU_TEXT_FLAG
)
holder
.
id_new_user_box_tips
?.
text
=
"New user $${bean.discount} discount"
holder
.
id_new_user_box_tips
?.
text
=
"New user $${bean.discount} discount"
}
}
...
...
moduleMain/src/main/res/layout/item_layout_new_box.xml
View file @
61cfec4a
...
@@ -14,10 +14,10 @@
...
@@ -14,10 +14,10 @@
android:id=
"@+id/id_img_goods"
android:id=
"@+id/id_img_goods"
android:layout_width=
"match_parent"
android:layout_width=
"match_parent"
android:layout_height=
"140dp"
android:layout_height=
"140dp"
android:layout_marginTop=
"30dp"
android:layout_marginBottom=
"20dp"
android:layout_marginLeft=
"20dp"
android:layout_marginLeft=
"20dp"
android:layout_marginTop=
"30dp"
android:layout_marginRight=
"20dp"
android:layout_marginRight=
"20dp"
android:layout_marginBottom=
"20dp"
android:adjustViewBounds=
"true"
/>
android:adjustViewBounds=
"true"
/>
<TextView
<TextView
...
@@ -97,13 +97,14 @@
...
@@ -97,13 +97,14 @@
android:text=
"@string/reduce"
android:text=
"@string/reduce"
android:textColor=
"@color/white"
android:textColor=
"@color/white"
android:textSize=
"13sp"
android:textSize=
"13sp"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
</RelativeLayout>
</RelativeLayout>
<LinearLayout
<LinearLayout
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_marginBottom=
"5dp"
>
android:layout_marginBottom=
"5dp"
android:gravity=
"center_vertical"
>
<TextView
<TextView
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
@@ -111,7 +112,14 @@
...
@@ -111,7 +112,14 @@
android:text=
"$"
android:text=
"$"
android:textColor=
"@color/color_4c84ff"
android:textColor=
"@color/color_4c84ff"
android:textSize=
"14sp"
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
<TextView
android:id=
"@+id/id_tv_price"
android:id=
"@+id/id_tv_price"
...
@@ -129,7 +137,9 @@
...
@@ -129,7 +137,9 @@
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
android:layout_height=
"wrap_content"
android:layout_height=
"wrap_content"
android:textColor=
"@color/color_999999"
android:textColor=
"@color/color_999999"
android:textSize=
"14sp"
/>
android:textSize=
"14sp"
android:drawableLeft=
"@drawable/icon_jinbi"
android:drawablePadding=
"5dp"
/>
<TextView
<TextView
android:id=
"@+id/id_tv_sales_volume"
android:id=
"@+id/id_tv_sales_volume"
...
@@ -153,6 +163,7 @@
...
@@ -153,6 +163,7 @@
android:paddingTop=
"1.5dp"
android:paddingTop=
"1.5dp"
android:paddingRight=
"5dp"
android:paddingRight=
"5dp"
android:paddingBottom=
"1.5dp"
>
android:paddingBottom=
"1.5dp"
>
<TextView
<TextView
android:id=
"@+id/id_tv_baodi"
android:id=
"@+id/id_tv_baodi"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
@@ -161,7 +172,8 @@
...
@@ -161,7 +172,8 @@
android:text=
"100%必中"
android:text=
"100%必中"
android:textColor=
"@color/color_4c84ff"
android:textColor=
"@color/color_4c84ff"
android:textSize=
"12sp"
android:textSize=
"12sp"
android:visibility=
"gone"
/>
android:visibility=
"gone"
/>
<TextView
<TextView
android:id=
"@+id/id_tv_min_max_price"
android:id=
"@+id/id_tv_min_max_price"
android:layout_width=
"wrap_content"
android:layout_width=
"wrap_content"
...
@@ -171,8 +183,6 @@
...
@@ -171,8 +183,6 @@
android:textSize=
"12sp"
/>
android:textSize=
"12sp"
/>
</LinearLayout>
</LinearLayout>
</LinearLayout>
</LinearLayout>
...
...
moduleMain/src/main/res/layout/layout_detail_content2.xml
View file @
61cfec4a
...
@@ -30,7 +30,8 @@
...
@@ -30,7 +30,8 @@
android:text=
"@string/box_detail_open_box_money_unit"
android:text=
"@string/box_detail_open_box_money_unit"
android:textColor=
"@color/color_4C84FF"
android:textColor=
"@color/color_4C84FF"
android:textSize=
"14sp"
android:textSize=
"14sp"
android:textStyle=
"bold"
/>
android:textStyle=
"bold"
android:visibility=
"gone"
/>
<TextView
<TextView
android:id=
"@+id/id_tv_price"
android:id=
"@+id/id_tv_price"
...
@@ -40,6 +41,8 @@
...
@@ -40,6 +41,8 @@
android:layout_marginRight=
"5dp"
android:layout_marginRight=
"5dp"
android:layout_weight=
"1"
android:layout_weight=
"1"
android:includeFontPadding=
"false"
android:includeFontPadding=
"false"
android:drawableLeft=
"@drawable/icon_jinbi"
android:drawablePadding=
"5dp"
android:text=
"10499"
android:text=
"10499"
android:textColor=
"@color/color_4C84FF"
android:textColor=
"@color/color_4C84FF"
android:textSize=
"22sp"
android:textSize=
"22sp"
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment