[BugFix]修复首充弹窗ui问题
This commit is contained in:
@@ -187,17 +187,17 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
|
||||
1 -> {
|
||||
binding.rbPlanB.visibility = View.GONE
|
||||
binding.rbPlanC.visibility = View.GONE
|
||||
binding.rbPlanA.text = "${goodsList[0].chargeMoney}$"
|
||||
binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
|
||||
}
|
||||
2 -> {
|
||||
binding.rbPlanC.visibility = View.GONE
|
||||
binding.rbPlanA.text = "${goodsList[0].chargeMoney}$"
|
||||
binding.rbPlanB.text = "${goodsList[1].chargeMoney}$"
|
||||
binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
|
||||
binding.rbPlanB.text = "$${goodsList[1].chargeMoney}"
|
||||
}
|
||||
3 -> {
|
||||
binding.rbPlanA.text = "${goodsList[0].chargeMoney}$"
|
||||
binding.rbPlanB.text = "${goodsList[1].chargeMoney}$"
|
||||
binding.rbPlanC.text = "${goodsList[2].chargeMoney}$"
|
||||
binding.rbPlanA.text = "$${goodsList[0].chargeMoney}"
|
||||
binding.rbPlanB.text = "$${goodsList[1].chargeMoney}"
|
||||
binding.rbPlanC.text = "$${goodsList[2].chargeMoney}"
|
||||
}
|
||||
}
|
||||
if (AppMetaDataUtil.getChannelID().equals(Constants.GOOGLE)) {
|
||||
@@ -352,7 +352,7 @@ class FirstChargeDialog : BaseViewBindingActivity<DialogFirstChargeBinding>(),
|
||||
} else {
|
||||
val builder = SpannableStringBuilder(it.chargeProdTitle)
|
||||
builder.setSpan(
|
||||
ForegroundColorSpan(Color.parseColor("#FFA027")), giveMoneyIndex,
|
||||
ForegroundColorSpan(Color.parseColor("#BE5AF6")), giveMoneyIndex,
|
||||
giveMoneyIndex + (it.giveMoney?.length ?: 0),
|
||||
Spannable.SPAN_EXCLUSIVE_EXCLUSIVE
|
||||
)
|
||||
|
38
app/src/main/res/drawable/bg_first_charge_reward_item_10.xml
Normal file
38
app/src/main/res/drawable/bg_first_charge_reward_item_10.xml
Normal file
@@ -0,0 +1,38 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
|
||||
|
||||
<item>
|
||||
<shape android:shape="rectangle">
|
||||
|
||||
<corners android:radius="@dimen/dp_10" />
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#F8D6FF"
|
||||
android:startColor="#F0BEFF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
<item
|
||||
android:bottom="2dp"
|
||||
android:left="2dp"
|
||||
android:right="2dp"
|
||||
android:top="2dp">
|
||||
<shape android:shape="rectangle">
|
||||
|
||||
<corners android:radius="@dimen/dp_10" />
|
||||
|
||||
<gradient
|
||||
android:angle="180"
|
||||
android:endColor="#F8E9FD"
|
||||
android:startColor="#F4D2FF"
|
||||
android:type="linear"
|
||||
android:useLevel="true" />
|
||||
|
||||
</shape>
|
||||
</item>
|
||||
|
||||
</layer-list>
|
@@ -14,7 +14,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_10"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="10dp"
|
||||
android:layout_marginStart="10dp"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_10"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -47,12 +47,12 @@
|
||||
android:id="@+id/tv_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="@dimen/dp_12"
|
||||
android:paddingEnd="@dimen/dp_12"
|
||||
android:text="@string/layout_item_first_charge_reward_01"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_11"
|
||||
app:corner="4dp"
|
||||
android:textSize="@dimen/text_size_9"
|
||||
app:corner="@dimen/dp_8"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
android:layout_marginTop="2dp"
|
||||
app:layout_constraintStart_toStartOf="@id/view_bg"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_6"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -47,14 +47,14 @@
|
||||
android:id="@+id/tv_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="@dimen/dp_7"
|
||||
android:paddingEnd="@dimen/dp_7"
|
||||
android:text="@string/layout_item_first_charge_reward_01"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_11"
|
||||
android:textSize="@dimen/text_size_9"
|
||||
app:corner="4dp"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginTop="@dimen/dp_2"
|
||||
app:layout_constraintStart_toStartOf="@id/view_bg"
|
||||
app:layout_constraintTop_toTopOf="@id/view_bg"
|
||||
app:left_bottom_corner="false"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_6"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -47,12 +47,12 @@
|
||||
android:id="@+id/tv_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="@dimen/dp_7"
|
||||
android:paddingEnd="@dimen/dp_7"
|
||||
android:text="@string/layout_item_first_charge_reward_01"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_11"
|
||||
app:corner="4dp"
|
||||
android:textSize="@dimen/text_size_9"
|
||||
app:corner="@dimen/dp_4"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
android:layout_marginTop="2dp"
|
||||
app:layout_constraintStart_toStartOf="@id/view_bg"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_6"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -47,11 +47,11 @@
|
||||
android:id="@+id/tv_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="@dimen/dp_7"
|
||||
android:paddingEnd="@dimen/dp_7"
|
||||
android:text="@string/layout_item_first_charge_reward_01"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_11"
|
||||
android:textSize="@dimen/text_size_9"
|
||||
app:corner="4dp"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
android:layout_marginTop="2dp"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_6"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -47,14 +47,14 @@
|
||||
android:id="@+id/tv_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="@dimen/dp_7"
|
||||
android:paddingEnd="@dimen/dp_7"
|
||||
android:text="@string/layout_item_first_charge_reward_01"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_11"
|
||||
app:corner="4dp"
|
||||
android:textSize="@dimen/text_size_9"
|
||||
app:corner="@dimen/dp_4"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginTop="@dimen/dp_2"
|
||||
app:layout_constraintStart_toStartOf="@id/view_bg"
|
||||
app:layout_constraintTop_toTopOf="@id/view_bg"
|
||||
app:left_bottom_corner="false"
|
||||
|
@@ -22,7 +22,7 @@
|
||||
android:layout_height="0dp"
|
||||
android:layout_marginEnd="@dimen/dp_6"
|
||||
android:layout_marginStart="@dimen/dp_6"
|
||||
android:background="@drawable/bg_first_charge_reward_item"
|
||||
android:background="@drawable/bg_first_charge_reward_item_6"
|
||||
app:layout_constraintDimensionRatio="1:1"
|
||||
app:layout_constraintEnd_toEndOf="parent"
|
||||
app:layout_constraintStart_toStartOf="parent"
|
||||
@@ -47,14 +47,14 @@
|
||||
android:id="@+id/tv_time"
|
||||
android:layout_width="wrap_content"
|
||||
android:layout_height="wrap_content"
|
||||
android:paddingStart="2dp"
|
||||
android:paddingEnd="2dp"
|
||||
android:paddingStart="@dimen/dp_7"
|
||||
android:paddingEnd="@dimen/dp_7"
|
||||
android:text="@string/layout_item_first_charge_reward_01"
|
||||
android:textColor="@color/white"
|
||||
android:textSize="@dimen/sp_11"
|
||||
android:textSize="@dimen/text_size_9"
|
||||
app:corner="4dp"
|
||||
android:layout_marginStart="@dimen/dp_2"
|
||||
android:layout_marginTop="2dp"
|
||||
android:layout_marginTop="@dimen/dp_2"
|
||||
app:layout_constraintStart_toStartOf="@id/view_bg"
|
||||
app:layout_constraintTop_toTopOf="@id/view_bg"
|
||||
app:left_bottom_corner="false"
|
||||
|
Reference in New Issue
Block a user