Skip to content

R
RvApp
Commit 0485bb2f authored by jianglx's avatar jianglx
Browse files
Options

修改会员显示问题

parent a2b4c22d
Hide whitespace changes
Inline Side-by-side
Showing with 156 additions and 68 deletions
module_mine/src/main/java/com/rv/rvmine/MineFragment.java
View file @ 0485bb2f
......@@ -73,6 +73,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
TextView tvNickname;
@BindView(R2.id.iv_member)
ImageView ivMember;
@BindView(com.rv.member.R2.id.tv_member)
TextView tvMember;
@BindView(R2.id.tv_login)
TextView tvLogin;
@BindView(R2.id.tv_verified)
......@@ -135,13 +137,14 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心");
} else {
tvNickname.setVisibility(View.VISIBLE);
ivMember.setVisibility(View.VISIBLE);
((View) ivMember.getParent()).setVisibility(View.VISIBLE);
// ivMember.setVisibility(View.VISIBLE);
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
tvViewPrivileges.setText("查看会员特权");
......@@ -267,7 +270,8 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (requestCode == 101 && resultCode == 201) {
ivAvatar.setImageResource(R.drawable.common_icon_avatar_default);
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
// ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
tvViewPrivileges.setText("会员中心");
......@@ -385,20 +389,22 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
tvVerified.setEnabled(false);
}
if (!TextUtils.isEmpty(info.getIcon()))
GlideManager.getInstance(getContext()).loadImage(info.getIcon(), ivMember);
if (0 == info.getIsMember()) {
tvMembershipLevel.setText("会员特权");
tvMemberHint.setText("免费用车7天");
ivMember.setImageResource(R.drawable.mycenter_icon_type_general_user);
tvMember.setText("普通用户");
} else if (1 == info.getIsMember()) {
if (1 == info.getMemberLevel()) { //1 普通会员 2 黄金会员 3 钻石会员
tvMembershipLevel.setText(" 普通会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_ordinary_member);
tvMember.setText("普通会员");
} else if (2 == info.getMemberLevel()) {
tvMembershipLevel.setText("黄金会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_gold_member);
tvMember.setText("黄金会员");
} else if (3 == info.getMemberLevel()) {
tvMembershipLevel.setText("钻石会员特权");
ivMember.setImageResource(R.drawable.mycenter_icon_type_diamond_membership);
tvMember.setText("钻石会员");
}
tvMemberHint.setText("免费用车" + info.getRentFreeDays() + "天");
}
......@@ -407,12 +413,14 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
// ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
} else {
tvNickname.setVisibility(View.VISIBLE);
ivMember.setVisibility(View.VISIBLE);
((View) ivMember.getParent()).setVisibility(View.VISIBLE);
// ivMember.setVisibility(View.VISIBLE);
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
}
......
module_mine/src/main/java/com/rv/rvmine/bean/UserInfoBean.java
View file @ 0485bb2f
......@@ -31,6 +31,8 @@ public class UserInfoBean extends BaseBean {
public static class UserInfo implements Serializable {
private Integer id;
private String icon ;
//用户id
private Integer userid;
//imid
......@@ -259,5 +261,13 @@ public class UserInfoBean extends BaseBean {
public void setMemberLevel(int memberLevel) {
this.memberLevel = memberLevel;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
}
}
module_mine/src/main/res/layout/activity_idcard_certification.xml
View file @ 0485bb2f
......@@ -60,12 +60,12 @@
</RelativeLayout>
<LinearLayout
android:visibility="gone"
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:background="@color/colorWrite"
android:orientation="horizontal"
android:padding="@dimen/size_15">
android:padding="@dimen/size_15"
android:visibility="gone">
<TextView
android:layout_width="wrap_content"
......@@ -80,9 +80,9 @@
android:layout_height="wrap_content"
android:background="@null"
android:hint="@string/tv_phone_hint"
android:inputType="number"
android:maxLength="11"
android:paddingLeft="@dimen/size_20"
android:inputType="number"
android:text=""
android:textColor="@color/textMain"
android:textSize="@dimen/text_14" />
......@@ -101,9 +101,9 @@
<LinearLayout
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:background="@color/colorWrite"
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@color/colorWrite"
android:gravity="center_vertical"
android:orientation="horizontal">
......@@ -116,10 +116,13 @@
<EditText
android:id="@+id/et_id_card"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:background="@null"
android:digits="0123456789xyzXYZ"
android:gravity="left|center_vertical"
android:hint="@string/tv_id_card_hint"
android:inputType="number|text"
android:maxLength="18"
android:paddingLeft="@dimen/size_20"
android:text=""
......@@ -133,107 +136,117 @@
android:layout_marginLeft="@dimen/size_15"
android:layout_marginRight="@dimen/size_15"
android:background="@color/colorWrite">
<include layout="@layout/common_line" />
</RelativeLayout>
<TextView
android:layout_width="match_parent"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_5"
android:background="@color/colorWrite"
android:padding="@dimen/size_15"
android:layout_marginTop="@dimen/size_5"
android:text="@string/tv_point"
android:textColor="@color/textMain"
android:textSize="@dimen/text_16" />
<RelativeLayout
android:id="@+id/rl_card"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_80"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_80"
android:layout_marginLeft="@dimen/size_80"
android:background="@color/colorLine"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:background="@color/colorLine">
<ImageView
android:id="@+id/iv_card"
android:scaleType="centerCrop"
android:layout_width="match_parent"
android:layout_height="@dimen/size_150" />
android:layout_height="@dimen/size_150"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/ll_card"
android:layout_centerInParent="true"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:layout_height="wrap_content">
android:orientation="vertical">
<ImageView
android:src="@drawable/common_icon_front"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_30" />
android:layout_height="@dimen/size_30"
android:src="@drawable/common_icon_front" />
<TextView
android:layout_marginTop="@dimen/size_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_front"
/>
android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_front" />
</LinearLayout>
</RelativeLayout>
<RelativeLayout
android:id="@+id/rl_card_copy"
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/size_80"
android:layout_marginTop="@dimen/size_20"
android:layout_marginRight="@dimen/size_80"
android:layout_marginLeft="@dimen/size_80"
android:background="@color/colorLine"
android:layout_width="match_parent"
android:layout_height="match_parent">
android:background="@color/colorLine">
<ImageView
android:id="@+id/iv_card_copy"
android:layout_width="match_parent"
android:scaleType="centerCrop"
android:layout_height="@dimen/size_150" />
android:layout_height="@dimen/size_150"
android:scaleType="centerCrop" />
<LinearLayout
android:id="@+id/ll_card_copy"
android:layout_centerInParent="true"
android:orientation="vertical"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_centerInParent="true"
android:gravity="center_horizontal"
android:layout_height="wrap_content">
android:orientation="vertical">
<ImageView
android:src="@drawable/common_icon_verso"
android:layout_width="@dimen/size_45"
android:layout_height="@dimen/size_30" />
android:layout_height="@dimen/size_30"
android:src="@drawable/common_icon_verso" />
<TextView
android:layout_marginTop="@dimen/size_10"
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:text="@string/tv_negative"
/>
android:layout_marginTop="@dimen/size_10"
android:text="@string/tv_negative" />
</LinearLayout>
</RelativeLayout>
<TextView
android:layout_marginTop="@dimen/size_15"
android:text="@string/tv_id_card_photo_hint"
android:layout_width="match_parent"
android:textSize="@dimen/text_12"
android:textColor="@color/textLightGrey"
android:layout_height="wrap_content"
android:layout_marginTop="@dimen/size_15"
android:gravity="center"
/>
android:text="@string/tv_id_card_photo_hint"
android:textColor="@color/textLightGrey"
android:textSize="@dimen/text_12" />
<TextView
android:layout_width="match_parent"
android:text="确定"
android:id="@+id/tv_ok"
android:layout_width="match_parent"
android:layout_height="@dimen/size_50"
android:layout_margin="@dimen/size_25"
android:textColor="@color/colorWrite"
android:background="@drawable/resource_drawable_shape_member_bg"
android:gravity="center"
android:textSize="@dimen/text_16"
android:layout_height="@dimen/size_50" />
android:text="确定"
android:textColor="@color/colorWrite"
android:textSize="@dimen/text_16" />
<View
android:layout_width="match_parent"
android:layout_height="@dimen/size_20"/>
android:layout_height="@dimen/size_20" />
</LinearLayout>
......
module_mine/src/main/res/layout/activity_mine.xml
View file @ 0485bb2f
......@@ -65,13 +65,29 @@
android:visibility="gone" />
<ImageView
android:id="@+id/iv_member"
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginTop="@dimen/text_10"
android:src="@drawable/mycenter_icon_type_general_user"
android:visibility="gone" />
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_member"
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15" />
<TextView
android:id="@+id/tv_member"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2"
android:gravity="center"
android:textColor="@color/gray_f5f5f5"
android:textSize="@dimen/text_10" />
</LinearLayout>
<TextView
......
plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java
View file @ 0485bb2f
......@@ -80,6 +80,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
TextView tvFreeDay;
@BindView(R2.id.tv_purchase_record)
TextView tvPurchaseRecord;
@BindView(R2.id.tv_member)
TextView tvMember;
private MemberListAdapter adapter;
private UserInfoBean.UserInfo info;
......@@ -267,7 +269,8 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
if (TextUtils.isEmpty(OkGoUtil.getToken())) {
tvNickname.setVisibility(View.GONE);
ivMember.setVisibility(View.GONE);
((View) ivMember.getParent()).setVisibility(View.GONE);
// ivMember.setVisibility(View.GONE);
tvLogin.setVisibility(View.VISIBLE);
tvVerified.setVisibility(View.GONE);
} else {
......@@ -275,14 +278,19 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
tvLogin.setVisibility(View.GONE);
tvVerified.setVisibility(View.VISIBLE);
if (info != null) {
ivMember.setVisibility(View.VISIBLE);
((View) ivMember.getParent()).setVisibility(View.VISIBLE);
// ivMember.setVisibility(View.VISIBLE);
if (!TextUtils.isEmpty(info.getIcon()))
GlideManager.getInstance(getApplicationContext()).loadImage(info.getIcon(), ivMember);
freeUseDay = info.getRentFreeDays();
if (info.getIsMember() == 0) {
memberLevel = 0;
if (adapter != null) {
adapter.setMemberLevel(memberLevel, freeUseDay);
}
ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership_1);
tvMember.setText("普通用户");
// ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership_1);
} else {
memberLevel = info.getMemberLevel();
if (adapter != null) {
......@@ -290,13 +298,13 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
}
switch (info.getMemberLevel()) {
case 1:
ivMember.setImageResource(R.drawable.mycenter_icon_ord_membership);
tvMember.setText("普通会员");
break;
case 2:
ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership);
tvMember.setText("黄金会员");
break;
case 3:
ivMember.setImageResource(R.drawable.mycenter_icon_sil_membership);
tvMember.setText("钻石会员");
break;
default:
break;
......
plugin_member/src/main/java/com/rv.member/PurchaseRecordActivity.java
View file @ 0485bb2f
......@@ -17,6 +17,7 @@ import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshView;
import com.rv.home.R2;
import com.rv.home.rv.module.ApiConfig;
import com.rv.home.rv.module.basic.presenter.CommonPresenter;
import com.rv.home.rv.module.ui.main.home.order.MemberOrderDetailsActivity;
import com.rv.home.rv.module.ui.main.home.order.OrderDetailActivity;
import com.rv.home.rv.module.ui.main.home.order.TravelOrderDetailsActivity;
import com.rv.home.rv.module.ui.main.home.order.adapter.CompletedAdapter;
......@@ -59,7 +60,7 @@ public class PurchaseRecordActivity extends BaseStatusActivity<CommonPresenter>
@Override
public void onItemClick(BaseQuickAdapter adapter, View view, int position) {
OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
startActivity(OrderDetailActivity.getIntent(PurchaseRecordActivity.this, dataBean));
startActivity(MemberOrderDetailsActivity.getIntent(PurchaseRecordActivity.this, dataBean));
}
});
}
......
plugin_member/src/main/java/com/rv.member/bean/UserInfoBean.java
View file @ 0485bb2f
......@@ -32,6 +32,8 @@ public class UserInfoBean extends BaseBean implements Serializable {
public static class UserInfo implements Serializable {
private Integer id;
private String icon ;
//用户id
private Integer userid;
//imid
......@@ -260,5 +262,13 @@ public class UserInfoBean extends BaseBean implements Serializable {
public void setMemberLevel(int memberLevel) {
this.memberLevel = memberLevel;
}
public String getIcon() {
return icon;
}
public void setIcon(String icon) {
this.icon = icon;
}
}
}
plugin_member/src/main/res/layout/activity_member.xml
View file @ 0485bb2f
......@@ -72,9 +72,31 @@
android:textSize="@dimen/text_16"
android:visibility="gone" />
<LinearLayout
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginTop="@dimen/text_10"
android:orientation="horizontal"
android:visibility="gone">
<ImageView
android:id="@+id/iv_member"
android:layout_width="@dimen/size_15"
android:layout_height="@dimen/size_15" />
<TextView
android:id="@+id/tv_member"
android:layout_width="wrap_content"
android:layout_height="@dimen/size_15"
android:layout_marginLeft="@dimen/size_2"
android:gravity="center"
android:textColor="@color/gray_f5f5f5"
android:textSize="@dimen/text_10" />
</LinearLayout>
<ImageView
android:id="@+id/iv_member"
android:id="@+id/wrap"
android:layout_width="@dimen/size_60"
android:layout_height="@dimen/size_20"
android:layout_marginTop="@dimen/text_10"
......
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