Commit 91a595f0 authored by mengcuiguang's avatar mengcuiguang

代码优化

parent de140f0b
...@@ -352,18 +352,16 @@ class VipForDialogActivity : BaseActivity(), VipView, View.OnClickListener, ...@@ -352,18 +352,16 @@ class VipForDialogActivity : BaseActivity(), VipView, View.OnClickListener,
finish() finish()
} }
R.id.ic_free_auto -> { R.id.ic_free_auto -> {
DialogUtils.showDialog( DialogUtils.showLeftDialog(
this, this,
SpanUtils() SpanUtils()
.append( .append(
"1、会员属于虚拟商品,一经购买不可退换 \n" + "1、会员属于虚拟商品,一经购买不可退换 \n2、未满18岁的未成年人需要在监护人主导、同意下进行相关付费操作;\n3、充值一般5分钟内到账,如未到账请在“我的”页面联系客服;"
"2、未满18岁的未成年人需要在监护人主导、同意下进行相关付费操作;\n" +
"3、充值一般5分钟内到账,如未到账请在“我的”页面联系客服;"
) )
.setForegroundColor( .setForegroundColor(
ContextCompat.getColor( ContextCompat.getColor(
this, this,
R.color.tv_message_recente_money R.color.black
) )
) )
.create(), .create(),
......
...@@ -108,18 +108,29 @@ class VipDialogAdapter(val vipList: MutableList<VipBean.ListBean>) : ...@@ -108,18 +108,29 @@ class VipDialogAdapter(val vipList: MutableList<VipBean.ListBean>) :
// holder.tvVipItemCurMoney.text = "¥${vipBean.price}" // holder.tvVipItemCurMoney.text = "¥${vipBean.price}"
//// holder.tvVipItemCurMoney.text = "¥${String.format("%.0f", vipBean.price)}" //// holder.tvVipItemCurMoney.text = "¥${String.format("%.0f", vipBean.price)}"
// } // }
if(vipBean.price==0.0){ if (vipBean.firstPayPriceAfterBack == 0.0) {
holder.tvVipItemCurMoney.text = SpanUtils() holder.tvVipItemCurMoney.text = SpanUtils()
.append("0.01") .append("¥")
.setFontSize(BubbleUtils.sp2px(34)) .append("0")
.append("元") .setFontSize(BubbleUtils.sp2px(36))
.create()
}else{
holder.tvVipItemCurMoney.text = SpanUtils()
.append(vipBean.price.toString())
.setFontSize(BubbleUtils.sp2px(34))
.append("元")
.create() .create()
} else {
try {
holder.tvVipItemCurMoney.text = SpanUtils()
.append("¥")
.append(vipBean.firstPayPriceAfterBack.toString())
.setFontSize(BubbleUtils.sp2px(36))
.create()
} catch (e: Exception) {
holder.tvVipItemCurMoney.text = SpanUtils()
.append("¥")
.append(vipBean.firstPayPriceAfterBack.toString())
.setFontSize(BubbleUtils.sp2px(36))
.create()
e.printStackTrace()
}
} }
// if (vipBean.oldPrice > 0) { // if (vipBean.oldPrice > 0) {
...@@ -151,10 +162,14 @@ class VipDialogAdapter(val vipList: MutableList<VipBean.ListBean>) : ...@@ -151,10 +162,14 @@ class VipDialogAdapter(val vipList: MutableList<VipBean.ListBean>) :
// R.color.color_FD7E0E // R.color.color_FD7E0E
// ) // )
// ) // )
holder.iv_vip_dialog_finger.visibility=View.VISIBLE holder.iv_vip_dialog_finger.visibility = View.VISIBLE
GlideUtils.loadImageViewGifUrl(context,holder.iv_vip_dialog_finger,"https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/ic_loading.gif") GlideUtils.loadImageViewGifUrl(
context,
holder.iv_vip_dialog_finger,
"https://mints-pkg.oss-cn-beijing.aliyuncs.com/pkg/img/ic_loading.gif"
)
} else { } else {
holder.iv_vip_dialog_finger.visibility=View.GONE holder.iv_vip_dialog_finger.visibility = View.GONE
holder.rlVipItemRoot.setBackgroundResource(R.drawable.shape_vip_adapter_none) holder.rlVipItemRoot.setBackgroundResource(R.drawable.shape_vip_adapter_none)
// holder.tvVipItemCurMoney.setTextColor( // holder.tvVipItemCurMoney.setTextColor(
// ContextCompat.getColor( // ContextCompat.getColor(
......
...@@ -149,7 +149,12 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR ...@@ -149,7 +149,12 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
homePresenter.topTabs() homePresenter.topTabs()
homePresenter.orders() homePresenter.orders()
TrackManager.getInstance().getMyInfo() TrackManager.getInstance().getMyInfo()
getData() if (userManager.vipFlag) {
getData()
iv_sign_main.visibility = View.VISIBLE
} else {
iv_sign_main.visibility = View.GONE
}
// showRecommendAct() // showRecommendAct()
} }
......
...@@ -62,12 +62,11 @@ ...@@ -62,12 +62,11 @@
<ImageView <ImageView
android:id="@+id/iv_vip_dialog_finger" android:id="@+id/iv_vip_dialog_finger"
android:layout_width="40dp" android:layout_width="50dp"
android:layout_height="40dp" android:layout_height="50dp"
android:layout_gravity="right|bottom" android:layout_gravity="right|bottom"
android:layout_marginRight="20dp" android:layout_marginRight="20dp"
android:layout_marginBottom="20dp" android:layout_marginBottom="20dp"></ImageView>
android:src="@mipmap/ic_launcher_main"></ImageView>
</FrameLayout> </FrameLayout>
<TextView <TextView
......
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