diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt index 7ef1e5191..13858d9d5 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/FirstChargeDialog.kt @@ -30,11 +30,11 @@ import com.umeng.commonsdk.statistics.common.DeviceConfig import com.yizhuan.erban.R import com.yizhuan.erban.base.BaseViewBindingActivity import com.yizhuan.erban.databinding.DialogFirstChargeBinding -import com.yizhuan.erban.event.ChargeEvent import com.yizhuan.erban.ui.pay.BillingManager import com.yizhuan.erban.ui.setting.ModifyPwdActivity import com.yizhuan.erban.ui.utils.RVDelegate import com.yizhuan.erban.ui.webview.CommonWebViewActivity +import com.yizhuan.erban.ui.widget.magicindicator.buildins.UIUtil import com.yizhuan.xchat_android_core.Constants import com.yizhuan.xchat_android_core.UriProvider import com.yizhuan.xchat_android_core.pay.PayModel @@ -44,7 +44,6 @@ import com.yizhuan.xchat_android_core.pay.bean.PayRecordId import com.yizhuan.xchat_android_core.pay.event.FirstChargeEvent import com.yizhuan.xchat_android_core.utils.net.IgnoreException import com.yizhuan.xchat_android_core.utils.toast -import com.yizhuan.xchat_android_library.annatation.ActLayoutRes import com.yizhuan.xchat_android_library.utils.AppMetaDataUtil import com.yizhuan.xchat_android_library.utils.ResUtil import com.yizhuan.xchat_android_library.utils.SingleToastUtil @@ -52,7 +51,11 @@ import org.greenrobot.eventbus.EventBus import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode -@ActLayoutRes(R.layout.dialog_first_charge) +/** + * author: wushaocheng + * time: 2022/2/21 + * desc: 限既首充 + */ class FirstChargeDialog : BaseViewBindingActivity(), BillingManager.BillingUpdatesListener { @@ -87,6 +90,9 @@ class FirstChargeDialog : BaseViewBindingActivity(), binding.rbPlanA.isChecked = true binding.rbPlanB.isChecked = false binding.rbPlanC.isChecked = false + binding.ivArrow1.visibility = View.VISIBLE + binding.ivArrow2.visibility = View.INVISIBLE + binding.ivArrow3.visibility = View.INVISIBLE updateCurrGoods(goodsList?.getOrNull(0)) position = 0 } @@ -94,6 +100,9 @@ class FirstChargeDialog : BaseViewBindingActivity(), binding.rbPlanA.isChecked = false binding.rbPlanB.isChecked = true binding.rbPlanC.isChecked = false + binding.ivArrow1.visibility = View.INVISIBLE + binding.ivArrow2.visibility = View.VISIBLE + binding.ivArrow3.visibility = View.INVISIBLE updateCurrGoods(goodsList?.getOrNull(1)) position = 1 } @@ -101,6 +110,9 @@ class FirstChargeDialog : BaseViewBindingActivity(), binding.rbPlanA.isChecked = false binding.rbPlanB.isChecked = false binding.rbPlanC.isChecked = true + binding.ivArrow1.visibility = View.INVISIBLE + binding.ivArrow2.visibility = View.INVISIBLE + binding.ivArrow3.visibility = View.VISIBLE updateCurrGoods(goodsList?.getOrNull(2)) position = 2 } @@ -361,7 +373,8 @@ class FirstChargeDialog : BaseViewBindingActivity(), } try { - helpPopupWindow.showAsDropDown(binding.viewAnchor, 0, 0, Gravity.BOTTOM) + helpPopupWindow.showAsDropDown(binding.ivHelp, + UIUtil.dip2px(context, 18.0), UIUtil.dip2px(context, -3.0), Gravity.END) } catch (e: Exception) { e.printStackTrace() } diff --git a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt index 96b6046f7..3b1d759da 100644 --- a/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt +++ b/app/src/main/java/com/yizhuan/erban/avroom/firstcharge/RewardAdapter.kt @@ -20,7 +20,7 @@ class RewardAdapter(private val itemWidth: Int) : mContext, item.showPir, helper.getView(R.id.iv_pic), - R.drawable.default_cover + R.drawable.ic_first_charge_default ) helper.setText(R.id.tv_name, item.showText) .setText(R.id.tv_time, item.showTime) diff --git a/app/src/main/java/com/yizhuan/erban/ui/user/activity/EditUserLabelActivity.kt b/app/src/main/java/com/yizhuan/erban/ui/user/activity/EditUserLabelActivity.kt index e2da8ce24..adc1b44a9 100644 --- a/app/src/main/java/com/yizhuan/erban/ui/user/activity/EditUserLabelActivity.kt +++ b/app/src/main/java/com/yizhuan/erban/ui/user/activity/EditUserLabelActivity.kt @@ -37,7 +37,6 @@ import org.greenrobot.eventbus.Subscribe import org.greenrobot.eventbus.ThreadMode import java.io.Serializable - /** * author: wushaocheng * time: 2022/2/16 diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge.webp b/app/src/main/res/drawable-xhdpi/bg_first_charge.webp index 33a68a5d4..dacc8921b 100644 Binary files a/app/src/main/res/drawable-xhdpi/bg_first_charge.webp and b/app/src/main/res/drawable-xhdpi/bg_first_charge.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_charge_btn.png b/app/src/main/res/drawable-xhdpi/bg_first_charge_charge_btn.png deleted file mode 100644 index 6af663e1c..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_first_charge_charge_btn.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_charge_btn.webp b/app/src/main/res/drawable-xhdpi/bg_first_charge_charge_btn.webp new file mode 100644 index 000000000..0e482fbb6 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_first_charge_charge_btn.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_help.9.png b/app/src/main/res/drawable-xhdpi/bg_first_charge_help.9.png deleted file mode 100644 index 4befe2092..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_first_charge_help.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_help.webp b/app/src/main/res/drawable-xhdpi/bg_first_charge_help.webp new file mode 100644 index 000000000..c06f53223 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_first_charge_help.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_product.9.png b/app/src/main/res/drawable-xhdpi/bg_first_charge_product.9.png deleted file mode 100644 index 065aa8f4a..000000000 Binary files a/app/src/main/res/drawable-xhdpi/bg_first_charge_product.9.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_product.webp b/app/src/main/res/drawable-xhdpi/bg_first_charge_product.webp new file mode 100644 index 000000000..5e28d6942 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_first_charge_product.webp differ diff --git a/app/src/main/res/drawable-xhdpi/bg_first_charge_tip.webp b/app/src/main/res/drawable-xhdpi/bg_first_charge_tip.webp new file mode 100644 index 000000000..fa6eb473d Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/bg_first_charge_tip.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_first_charge_arrow.webp b/app/src/main/res/drawable-xhdpi/ic_first_charge_arrow.webp new file mode 100644 index 000000000..bb10c6a78 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_first_charge_arrow.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_first_charge_default.webp b/app/src/main/res/drawable-xhdpi/ic_first_charge_default.webp new file mode 100644 index 000000000..a048ea3be Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_first_charge_default.webp differ diff --git a/app/src/main/res/drawable-xhdpi/ic_first_charge_help.png b/app/src/main/res/drawable-xhdpi/ic_first_charge_help.png deleted file mode 100644 index f16383a41..000000000 Binary files a/app/src/main/res/drawable-xhdpi/ic_first_charge_help.png and /dev/null differ diff --git a/app/src/main/res/drawable-xhdpi/ic_first_charge_help.webp b/app/src/main/res/drawable-xhdpi/ic_first_charge_help.webp new file mode 100644 index 000000000..f7b2a1676 Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/ic_first_charge_help.webp differ diff --git a/app/src/main/res/drawable/bg_first_charge_list.xml b/app/src/main/res/drawable/bg_first_charge_list.xml index 8a3f341ca..728b70609 100644 --- a/app/src/main/res/drawable/bg_first_charge_list.xml +++ b/app/src/main/res/drawable/bg_first_charge_list.xml @@ -2,10 +2,6 @@ - - + + diff --git a/app/src/main/res/drawable/bg_first_charge_reward_item.xml b/app/src/main/res/drawable/bg_first_charge_reward_item.xml index 3215e824e..2eefdfb20 100644 --- a/app/src/main/res/drawable/bg_first_charge_reward_item.xml +++ b/app/src/main/res/drawable/bg_first_charge_reward_item.xml @@ -1,7 +1,38 @@ - - - - + + + + + + + + + + + + + + + + + + + + + + + diff --git a/app/src/main/res/drawable/bg_first_charge_selector_rb_plan_a.xml b/app/src/main/res/drawable/bg_first_charge_selector_rb_plan_a.xml index ff0f7a0a4..8bcf72105 100644 --- a/app/src/main/res/drawable/bg_first_charge_selector_rb_plan_a.xml +++ b/app/src/main/res/drawable/bg_first_charge_selector_rb_plan_a.xml @@ -4,8 +4,13 @@ - - + + + \ No newline at end of file diff --git a/app/src/main/res/layout/dialog_first_charge.xml b/app/src/main/res/layout/dialog_first_charge.xml index 9ff933713..a1402a0e5 100644 --- a/app/src/main/res/layout/dialog_first_charge.xml +++ b/app/src/main/res/layout/dialog_first_charge.xml @@ -3,67 +3,115 @@ 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_gravity="center"> + android:layout_height="match_parent"> - + app:layout_constraintTop_toTopOf="parent" /> - + - - - + + + + + + + + + + + android:layout_marginTop="@dimen/dp_10" + app:layout_constraintStart_toStartOf="parent" + app:layout_constraintEnd_toEndOf="parent" + app:layout_constraintBottom_toBottomOf="parent" + app:layout_constraintTop_toBottomOf="@+id/tv_title" /> - + + app:layout_constraintVertical_bias="0.33"> @@ -83,12 +131,13 @@ android:id="@+id/rb_plan_b" android:layout_width="0dp" android:layout_height="30dp" + android:layout_marginStart="@dimen/dp_12" android:layout_weight="1" android:background="@drawable/bg_first_charge_selector_rb_plan_a" android:button="@null" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/color_selector_white_false_845dff" + android:textColor="@color/color_white" android:textSize="14sp" tools:text="@string/layout_dialog_first_charge_03" /> @@ -96,49 +145,42 @@ android:id="@+id/rb_plan_c" android:layout_width="0dp" android:layout_height="30dp" + android:layout_marginStart="@dimen/dp_12" android:layout_weight="1" android:background="@drawable/bg_first_charge_selector_rb_plan_a" android:button="@null" android:gravity="center" android:includeFontPadding="false" - android:textColor="@color/color_selector_white_false_845dff" + android:textColor="@color/color_white" android:textSize="14sp" tools:text="@string/layout_dialog_first_charge_04" /> - - - - + app:layout_constraintEnd_toEndOf="@+id/view_bg" + app:layout_constraintTop_toTopOf="@+id/view_bg" /> + app:layout_constraintEnd_toEndOf="@+id/view_bg" + app:layout_constraintStart_toStartOf="@+id/view_bg" + app:layout_constraintTop_toBottomOf="@+id/view_bg" /> diff --git a/app/src/main/res/layout/item_first_charge_reward.xml b/app/src/main/res/layout/item_first_charge_reward.xml index 244434de6..c3534b6cd 100644 --- a/app/src/main/res/layout/item_first_charge_reward.xml +++ b/app/src/main/res/layout/item_first_charge_reward.xml @@ -29,7 +29,7 @@ app:layout_constraintEnd_toEndOf="@id/view_bg" app:layout_constraintStart_toStartOf="@id/view_bg" app:layout_constraintTop_toTopOf="@id/view_bg" - tools:src="@drawable/default_cover" /> + tools:src="@drawable/ic_first_charge_default" /> + app:shaderStartColor="#E669F7" /> + android:textSize="@dimen/sp_12" /> \ No newline at end of file diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 5ff52086c..57945e5db 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -650,5 +650,6 @@ #3AD5F8 #00C4EA #E1FAFF + #BE5AF6