Commit b408abbf authored by jyx's avatar jyx

优化样式

parent 3af3334d
......@@ -11,6 +11,7 @@ import android.text.TextUtils
import android.view.KeyEvent
import android.view.View
import android.widget.CompoundButton
import androidx.recyclerview.widget.GridLayoutManager
import androidx.recyclerview.widget.LinearLayoutManager
import com.daimajia.androidanimations.library.Techniques
import com.daimajia.androidanimations.library.YoYo
......@@ -400,7 +401,7 @@ class VipActivity : BaseActivity(), VipView, View.OnClickListener,
private fun initRvView() {
if (vipList != null && vipList!!.size > 0) {
val gridLayoutManager = LinearLayoutManager(this)
val gridLayoutManager = GridLayoutManager(this, 3)
rvVip.layoutManager = gridLayoutManager
vipAdapter = VipAdapter(vipList!!)
rvVip.adapter = vipAdapter
......
......@@ -40,7 +40,7 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
}
inner class ViewHolder(view: View) : RecyclerView.ViewHolder(view) {
val rlVipItemRoot: FrameLayout = view.findViewById(R.id.rlVipItemRoot)
val rlVipItemRoot: LinearLayout = view.findViewById(R.id.rlVipItemRoot)
val tvVipItemCurMoney: TextView = view.findViewById(R.id.tvVipItemCurMoney)
val tvVipItemMoney: TextView = view.findViewById(R.id.tvVipItemMoney)
val tvVipItemTitle: TextView = view.findViewById(R.id.tvVipItemTitle)
......@@ -118,7 +118,7 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
// 跳转小程序领券
holder.tvVipItemCurMoney.text = SpanUtils()
.append(vipBean.oldPrice.toFloat().toString())
.setFontSize(BubbleUtils.sp2px(34))
// .setFontSize(BubbleUtils.sp2px(34))
.append(" 元\n")
.setFontSize(BubbleUtils.sp2px(14))
.append("原价:" + vipBean.price.toFloat().toString() + " 元")
......@@ -129,14 +129,16 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
if (vipBean.price == 0.0) {
holder.tvVipItemCurMoney.text = SpanUtils()
.append("0.01")
.setFontSize(BubbleUtils.sp2px(34))
// .setFontSize(BubbleUtils.sp2px(34))
.append("元")
.setFontSize(BubbleUtils.sp2px(14))
.create()
} else {
holder.tvVipItemCurMoney.text = SpanUtils()
.append(vipBean.price.toString())
.setFontSize(BubbleUtils.sp2px(34))
// .setFontSize(BubbleUtils.sp2px(34))
.append("元")
.setFontSize(BubbleUtils.sp2px(14))
.create()
}
}
......@@ -153,8 +155,25 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
// holder.tvVipItemMoney.visibility = View.INVISIBLE
// }
// }
holder.tvVipItemMoney.text = vipBean.topTitle
// holder.tvVipItemMoney.text = vipBean.topTitle
try {
if (!TextUtils.isEmpty(vipBean.topTitle)) {
val topArray = vipBean.topTitle.split(",")
if (topArray != null && topArray.size > 0) {
holder.tvVipItemLable.text = topArray[0] ?: ""
holder.tvVipItemCurMoney.text = topArray[1] ?: ""
holder.tvVipItemMoney.text = topArray[2] ?: ""
holder.tvVipItemTitle.text = topArray[3] ?: ""
}
}
} catch (e:Exception) {
e.printStackTrace()
holder.tvVipItemLable.text = ""
holder.tvVipItemCurMoney.text = ""
holder.tvVipItemMoney.text = ""
holder.tvVipItemTitle.text = ""
}
holder.rlVipItemRoot.setOnClickListener {
mOnItemClickListener.onItemClick(position)
......@@ -164,20 +183,20 @@ class VipAdapter(val vipList: MutableList<VipBean.ListBean>) :
if (getPosition() == position) {
//当前选中
holder.rlVipItemRoot.setBackgroundResource(R.drawable.shape_vip_adapter)
// holder.tvVipItemCurMoney.setTextColor(
// ContextCompat.getColor(
// context,
// R.color.color_FD7E0E
// )
// )
holder.tvVipItemCurMoney.setTextColor(
ContextCompat.getColor(
context,
R.color.color_FD7E0E
)
)
} else {
holder.rlVipItemRoot.setBackgroundResource(R.drawable.shape_vip_adapter_none)
// holder.tvVipItemCurMoney.setTextColor(
// ContextCompat.getColor(
// context,
// R.color.white
// )
// )
holder.tvVipItemCurMoney.setTextColor(
ContextCompat.getColor(
context,
R.color.white
)
)
}
holder.itemView.setTag(position)
......
......@@ -6,6 +6,6 @@
<solid android:color="@color/black" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="5dip" />
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
......@@ -6,6 +6,6 @@
<solid android:color="@color/black" />
<!-- 设置按钮的四个角为弧形 -->
<!-- android:radius 弧形的半径 -->
<corners android:radius="5dip" />
<corners android:radius="10dip" />
</shape>
\ No newline at end of file
......@@ -139,7 +139,7 @@
<androidx.recyclerview.widget.RecyclerView
android:id="@+id/rvVip"
android:layout_width="match_parent"
android:layout_height="130dp"
android:layout_height="180dp"
android:layout_gravity="center_horizontal"
android:background="@null"
android:overScrollMode="never" />
......
<?xml version="1.0" encoding="utf-8"?>
<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
xmlns:app="http://schemas.android.com/apk/res-auto"
xmlns:tools="http://schemas.android.com/tools"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginLeft="20dp"
android:layout_marginTop="10dp"
android:layout_marginRight="20dp"
android:layout_marginBottom="10dp"
android:id="@+id/rlVipItemRoot"
android:layout_width="110dp"
android:layout_height="160dp"
android:layout_margin="10dp"
android:background="@drawable/shape_vip_adapter_none"
android:orientation="vertical">
<FrameLayout
android:id="@+id/rlVipItemRoot"
android:layout_width="match_parent"
android:layout_height="110dp"
android:layout_marginTop="8dp"
android:background="@drawable/shape_vip_adapter_none"
android:orientation="vertical">
<RelativeLayout
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_gravity="center_vertical"
android:layout_marginTop="-8dp">
<TextView
android:id="@+id/tvVipItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerVertical="true"
android:layout_gravity="center_horizontal"
android:layout_marginLeft="18dp"
android:textColor="#efbc6a"
android:textSize="20sp"
android:textStyle="bold"
tools:text="包年会员" />
<TextView
android:id="@+id/tvVipItemCurMoney"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_alignParentRight="true"
android:layout_centerVertical="true"
android:layout_marginRight="18dp"
android:gravity="center"
android:lineSpacingExtra="-6dp"
android:textColor="#efbc6a"
android:textSize="16sp"
tools:text="$78" />
</RelativeLayout>
<TextView
android:id="@+id/tvVipItemMoney"
android:layout_width="match_parent"
android:layout_height="28dp"
android:layout_gravity="bottom"
android:background="@drawable/shape_vip_lable"
android:gravity="center"
android:textColor="@color/color_A24240"
android:textSize="12sp"
tools:text="原价:123" />
</FrameLayout>
<TextView
android:id="@+id/tvVipItemLable"
android:layout_width="wrap_content"
......@@ -77,6 +20,39 @@
android:paddingRight="6dp"
android:paddingBottom="2dp"
android:textColor="@color/color_815136"
android:textSize="14sp"
android:textSize="10sp"
tools:text="包年会员" />
<TextView
android:id="@+id/tvVipItemTitle"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="16dp"
android:textColor="@color/white"
android:textSize="18sp"
tools:text="包年会员" />
</FrameLayout>
\ No newline at end of file
<TextView
android:id="@+id/tvVipItemCurMoney"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:gravity="center"
android:textColor="#373737"
android:textSize="24sp"
tools:text="$78" />
<TextView
android:id="@+id/tvVipItemMoney"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_gravity="center_horizontal"
android:layout_marginTop="10dp"
android:layout_marginBottom="16dp"
android:textColor="#939AA3"
android:textSize="14sp"
tools:text="原价:123" />
</LinearLayout>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment