Skip to content

R
RvApp
Commit 3e2e2021 authored by jianglx's avatar jianglx
Browse files
Options

修改实名认证与登录框的背景色的圆角大小，修改免费用车天数数目显示不正确的问题

parent bc6ce703
Hide whitespace changes
Inline Side-by-side
Showing with 40 additions and 24 deletions
module_mine/src/main/res/layout/activity_mine.xml
View file @ 3e2e2021
......@@ -68,7 +68,7 @@
android:layout_width="@dimen/size_150"
android:layout_height="@dimen/size_40"
android:layout_gravity="center"
android:background="@drawable/resource_drawable_shape_yellow_line"
android:background="@drawable/shape_rv_bg_btn_yellow"
android:gravity="center"
android:text="@string/tv_login"
android:textColor="@color/colorYellow"
......@@ -79,7 +79,7 @@
android:id="@+id/tv_verified"
android:layout_width="@dimen/text_90"
android:layout_height="@dimen/text_30"
android:background="@drawable/resource_drawable_shape_yellow_line"
android:background="@drawable/shape_rv_bg_btn_yellow"
android:gravity="center"
android:text="未实名认证"
android:textColor="@color/colorYellow"
......
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @ 3e2e2021
......@@ -83,6 +83,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
private UserInfoBean.UserInfo info;
private IWXAPI api;
private int memberLevel = 0; // 会员等级
private int freeUseDay = 0; // 免费租车天数
public static Intent getIntent(Context context) {
return new Intent(context, MemberCenterActivity.class);
......@@ -132,7 +133,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
switch (requestType) {
case 0:
if (adapter == null) {
adapter = new MemberListAdapter(((MemberListBean) result).getData(), memberLevel, MemberCenterActivity.this, payListener);
adapter = new MemberListAdapter(((MemberListBean) result).getData(), memberLevel, freeUseDay,MemberCenterActivity.this, payListener);
recyclerView.setAdapter(adapter);
} else {
adapter.setDate(((MemberListBean) result).getData());
......@@ -247,17 +248,17 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
tvVerified.setVisibility(View.VISIBLE);
if (info != null) {
ivMember.setVisibility(View.VISIBLE);
freeUseDay = info.getRentFreeDays() ;
if (info.getIsMember() == 0) {
memberLevel = 0;
if (adapter != null) {
adapter.setMemberLevel(memberLevel);
adapter.setMemberLevel(memberLevel,freeUseDay);
}
ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership_1);
} else {
memberLevel = info.getMemberLevel();
if (adapter != null) {
adapter.setMemberLevel(memberLevel);
adapter.setMemberLevel(memberLevel,freeUseDay);
}
switch (info.getMemberLevel()) {
case 1:
......@@ -314,6 +315,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
} else if (i == R.id.ll_item_wechat) {
payType = 1;
helper.setChecked(R.id.rb_wechat, true);
helper.setChecked(R.id.rb_alipay, false);
} else if (i == R.id.ll_item_alipay) {
showToast("该功能还没有开通！");
......
plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java
View file @ 3e2e2021
......@@ -35,6 +35,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
private List<MemberListBean.MemberCard> mData;
private PayListener payListener;
private int memberLevel;
private int freeUseDay;
private GridMemerAdapter adapter;
private MemberListBean.MemberCard selectCard;
private int selectPostion;
......@@ -43,8 +44,9 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
void pay(MemberListBean.MemberCard card);
}
public void setMemberLevel(int memberLevel) {
public void setMemberLevel(int memberLevel, int freeUseDay) {
this.memberLevel = memberLevel;
this.freeUseDay = freeUseDay;
notifyDataSetChanged();
}
......@@ -53,8 +55,9 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
notifyDataSetChanged();
}
public MemberListAdapter(@Nullable List<MemberListBean.MemberCard> data, int memberLevel, Context context, PayListener listener) {
public MemberListAdapter(@Nullable List<MemberListBean.MemberCard> data, int memberLevel, int freeUseDay, Context context, PayListener listener) {
this.memberLevel = memberLevel;
this.freeUseDay = freeUseDay;
this.mContext = context;
this.payListener = listener;
selectPostion = 1;
......@@ -112,6 +115,12 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
SpannableString spannableString = new SpannableString(viewHolder.tv_agreement.getText());
spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#FFB74B")), 6, spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
viewHolder.tv_agreement.setText(spannableString);
viewHolder.tv_agreement.setOnClickListener(new View.OnClickListener() {
@Override
public void onClick(View view) {
}
});
viewHolder.img_agree.setImageResource(hasAgree ? R.drawable.common_icon_selected : R.drawable.common_icon_radio_unche);
viewHolder.btn_buy.setBackgroundResource(hasAgree ? R.drawable.shape_rv_bg_dark_yellow : R.drawable.shape_rv_bg_btn_grap_yellow);
......@@ -189,27 +198,23 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
private void setMemeberTop(final HeadViewHolder viewHolder) {
if (memberLevel > 0) {
viewHolder.rlTop.setVisibility(View.VISIBLE);
viewHolder.imgFreedayTop.setText(freeUseDay + "天");
viewHolder.tvFreedayTop.setText("免费用车" + freeUseDay + "天");
switch (memberLevel) {
case 1:
viewHolder.imgDiscountTop.setImageResource(R.drawable.member_discount_8);
viewHolder.tvDiscountTop.setText("租车8折");
viewHolder.imgFreedayTop.setImageResource(R.drawable.member_free_day_5);
viewHolder.tvFreedayTop.setText("免费用车" + mData.get(1).getNumber() + "天");
break;
case 2:
viewHolder.imgDiscountTop.setImageResource(R.drawable.member_discount_7);
viewHolder.tvDiscountTop.setText("租车7折");
viewHolder.imgFreedayTop.setImageResource(R.drawable.member_free_day_12);
viewHolder.tvFreedayTop.setText("免费用车" + mData.get(2).getNumber() + "天");
break;
case 3:
viewHolder.imgDiscountTop.setImageResource(R.drawable.member_discount_6);
viewHolder.tvDiscountTop.setText("租车6折");
viewHolder.imgFreedayTop.setImageResource(R.drawable.member_free_day_28);
viewHolder.tvFreedayTop.setText("免费用车" + mData.get(3).getNumber() + "天");
break;
}
} else {
viewHolder.rlTop.setVisibility(View.GONE);
}
......@@ -258,7 +263,7 @@ public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHol
ImageView imgDiscountTop;
TextView tvDiscountTop;
Button btnDisountUse;
ImageView imgFreedayTop;
TextView imgFreedayTop;
TextView tvFreedayTop;
Button btnFreedayUse;
......
plugin_member/src/main/res/drawable/resource_drawable_shape_yellow_line.xml → plugin_member/src/main/res/drawable/shape_rv_bg_btn_yellow.xml
View file @ 3e2e2021
......@@ -2,7 +2,7 @@
<shape xmlns:android="http://schemas.android.com/apk/res/android"
android:shape="rectangle">
<!--空心框 圆角 少量红-->
<corners android:radius="@dimen/ui_dimen_radius" />
<corners android:radius="5dp" />
<stroke
android:width="@dimen/ui_dimen_stroke"
android:color="@color/colorYellow" />
......
plugin_member/src/main/res/layout/activity_member.xml
View file @ 3e2e2021
......@@ -87,7 +87,7 @@
android:layout_width="@dimen/size_150"
android:layout_height="@dimen/size_40"
android:layout_gravity="center"
android:background="@drawable/resource_drawable_shape_yellow_line"
android:background="@drawable/shape_rv_bg_btn_yellow"
android:gravity="center"
android:text="@string/tv_login"
android:textColor="@color/colorYellow"
......@@ -97,9 +97,9 @@
<TextView
android:id="@+id/tv_verified"
android:layout_width="@dimen/text_90"
android:layout_height="@dimen/text_30"
android:background="@drawable/resource_drawable_shape_yellow_line"
android:layout_width="@dimen/size_80"
android:layout_height="27dp"
android:background="@drawable/shape_rv_bg_btn_yellow"
android:gravity="center"
android:text="未实名认证"
android:textColor="@color/colorYellow"
......
plugin_member/src/main/res/layout/view_member_privilege.xml
View file @ 3e2e2021
......@@ -59,11 +59,20 @@
android:gravity="center"
android:orientation="vertical">
<ImageView
<TextView
android:id="@+id/img_freeday_top"
android:layout_width="@dimen/size_50"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_50"
android:layout_marginTop="13dp" />
android:layout_marginTop="13dp"
android:background="@drawable/bg_member_free_day"
android:fontFamily="serif"
android:gravity="center"
android:minWidth="@dimen/size_50"
android:paddingLeft="@dimen/size_5"
android:paddingRight="@dimen/size_5"
android:textColor="@color/white"
android:textSize="@dimen/text_22"
android:textStyle="bold" />
<TextView
android:id="@+id/tv_freeday_top"
......
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