最新的会员模块

RvClient/src/main/java/com/xxfc/rv/WelcomeActivity.java

@@ -7,6 +7,7 @@ import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.view.View;
+import android.widget.Toast;
 
 import com.base.utils.tools.android.NetworkUtil;
 import com.ruiwenliu.wrapper.SPConstance;
@@ -36,6 +37,8 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
 
     private boolean isImInitOk = false;
 
+    private boolean isInterval = false;
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         if (requestType == 0) {
@@ -47,22 +50,14 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
                 config = bean.getData();
                 AppConfig appConfig = AppConfig.initConfig(config);
                 RvCache.getInstance().save(appConfig, CacheEnum.IM_CONFIG);
+                if (isInterval && !isFinishing()) {
+                    go();
                 }
             }
         }
-
-    @Override
-    public void onShowError(String errorMsg, int errorType) {
-        AppConfig appConfig = (AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG);
-        if (appConfig == null) {
-            if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
-                showToast("网络异常，im初始化失败，请退出重进");
-            }
-            return;
-        }
-        isImInitOk = true;
     }
 
+
     @Override
     protected int setLayout() {
         return R.layout.rv_act_weclome;
@@ -71,8 +66,17 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);//隐藏菜单栏
-        interval();
 
+        AppConfig appConfig = (AppConfig) RvCache.getInstance().get(CacheEnum.IM_CONFIG);
+        if (appConfig == null) {
+            if (!NetworkUtil.isNetworkAvailable(getApplicationContext())) {
+                Toast.makeText(getApplicationContext(), "网络异常，im初始化失败，请退出重进", Toast.LENGTH_SHORT).show();
+            }
+            return;
+        } else {
+            isImInitOk = true;
+        }
+        interval();
         LogUtil.d("start");
     }
 
@@ -97,15 +101,11 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
      */
     private void interval() {
         mDisposable = Flowable.interval(2, TimeUnit.SECONDS)
-                .doOnNext(new Consumer<Long>() {
-                    @Override
-                    public void accept(@NonNull Long aLong) throws Exception {
-                    }
+                .doOnNext(aLong -> {
                 })
                 .observeOn(AndroidSchedulers.mainThread())
-                .subscribe(new Consumer<Long>() {
-                    @Override
-                    public void accept(@NonNull Long aLong) {
+                .subscribe(aLong -> {
+                    isInterval = true;
                     try {
                         String token = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKEN, "");
                         String tokenTime = Cookie.getStringValue(getApplicationContext(), SPConstance.USER_JSON_TOKE_TIME, "");
@@ -115,18 +115,8 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
                     } catch (Exception e) {
                         e.printStackTrace();
                     }
-
                     if (isImInitOk) {
-                            SharedPreferences preferences = getSharedPreferences("first_open", MODE_PRIVATE);
-                            if (preferences.getBoolean("first", true)) {
-                                preferences.edit().putBoolean("first", false).commit();
-                                startActivity(GuideActivity.getIntent(mActivity));
-                            } else {
-                                startActivity(MainActivity.getIntent(mActivity));
-                            }
-                            mDisposable.dispose();
-                            finish();
-                        }
+                        go();
                     }
                 });
 
@@ -141,6 +131,18 @@ public class WelcomeActivity extends BaseActivity<CommonPresenter> {
         }
     }
 
+    private void go() {
+        SharedPreferences preferences = getSharedPreferences("first_open", MODE_PRIVATE);
+        if (preferences.getBoolean("first", true)) {
+            preferences.edit().putBoolean("first", false).commit();
+            startActivity(GuideActivity.getIntent(mActivity));
+        } else {
+            startActivity(MainActivity.getIntent(mActivity));
+        }
+        mDisposable.dispose();
+        finish();
+    }
+
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);

RvWrapper/src/main/assets/city.json

@@ -31,8 +31,8 @@
     "title": "A"
   }, {
     "lists": [{
-      "name": "北京",
-      "id": 110000
+      "name": "北京市",
+      "id": 110100
     }, {
       "name": "白银市",
       "id": 620400
@@ -51,6 +51,9 @@
     }, {
       "name": "巴中市",
       "id": 511900
+    },{
+      "name": "北海市",
+      "id": 450500
     }, {
       "name": "北海新区",
       "id": 371627
@@ -77,7 +80,7 @@
   }, {
     "lists": [{
       "name": "重庆",
-      "id": 500000
+      "id": 500100
     }, {
       "name": "成都市",
       "id": 510100
@@ -640,8 +643,8 @@
     "title": "R"
   }, {
     "lists": [{
-      "name": "上海",
-      "id": 310000
+      "name": "上海市",
+      "id": 310100
     }, {
       "name": "深圳市",
       "id": 440300
@@ -719,7 +722,7 @@
   }, {
     "lists": [{
       "name": "天津",
-      "id": 120000
+      "id": 120100
     }, {
       "name": "太原市",
       "id": 140100
@@ -805,8 +808,8 @@
       "name": "厦门市",
       "id": 350200
     }, {
-      "name": "西安区",
-      "id": 220403
+      "name": "西安市",
+      "id": 610100
     }, {
       "name": "西宁市",
       "id": 630100
@@ -1173,10 +1176,10 @@
     }, {
       "name": "中山区",
       "id": 210202
-    },{
+    }, {
       "name": "中山市",
       "id": 442000
-    },{
+    }, {
       "name": "钟山区",
       "id": 520201
     }, {

RvWrapper/src/main/java/com/ruiwenliu/wrapper/base/BaseActivity.java

@@ -29,6 +29,7 @@ import java.lang.reflect.ParameterizedType;
 public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperActivity implements BaseView, NetWorkReceiver.NetChangListener {
     protected P mPresenter;
     private LoadingDialog mLoadingDialog;
+    private boolean isLoadData = false;
 
     @Override
     protected void onCreate(@Nullable Bundle savedInstanceState) {
@@ -44,7 +45,10 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
         }
         mPresenter.attachView(this);
         mLoadingDialog = createLoadingDialog();
+        if (NetworkUtil.isNetworkAvailable(mActivity)) {
+            isLoadData = true;
             loadData(savedInstanceState, getIntent());
+        }
         NetWorkReceiver.getInstance().register(this);
     }
 
@@ -119,7 +123,10 @@ public abstract class BaseActivity<P extends MvpPresenter> extends BaseWrapperAc
 
     @Override
     public void netAvailable() {
+        if (!isLoadData) {
             loadData(null, getIntent());
+            isLoadData = true;
+        }
     }
 
     @Override

module_home/src/main/assets/city.json

@@ -51,6 +51,9 @@
     }, {
       "name": "巴中市",
       "id": 511900
+    },{
+      "name": "北海市",
+      "id": 450500
     }, {
       "name": "北海新区",
       "id": 371627

module_home/src/main/res/drawable/shape_rv_bg_open_diamond_member.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="30dp" />
+    <solid android:color="#464546" />
+</shape>
\ No newline at end of file

module_home/src/main/res/drawable/shape_rv_bg_open_gold_member.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="30dp" />
+    <solid android:color="#E7C48B" />
+</shape>
\ No newline at end of file

module_home/src/main/res/drawable/shape_rv_bg_open_normal_member.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="30dp" />
+    <solid android:color="#AAAEBA" />
+</shape>
\ No newline at end of file

plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

@@ -5,19 +5,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
-import android.support.v7.widget.LinearLayoutManager;
-import android.support.v7.widget.RecyclerView;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.View;
-import android.widget.ImageView;
 import android.widget.LinearLayout;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
-import com.alipay.sdk.app.EnvUtils;
-import com.base.utils.ui.image.round.RoundImageView;
 import com.frame.base.bus.LoginSuccessfulEvent;
 import com.frame.base.bus.Observer;
 import com.frame.base.bus.PaymentFailedEvent;
@@ -27,9 +20,7 @@ import com.frame.base.url.Constance;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
-import com.ruiwenliu.wrapper.statusbar.StatusBarUtil;
 import com.ruiwenliu.wrapper.util.ViewHolder;
-import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.dialog.PaymentTypeSelection;
 import com.rv.home.rv.module.ApiConfig;
@@ -37,13 +28,14 @@ import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
 import com.rv.member.bean.MemberListBean;
 
-import com.rv.member.adapter.MemberListAdapter;
 import com.rv.member.bean.BeanTourOrderPay;
 import com.rv.member.bean.MemberOrderBean;
 import com.ruiwenliu.wrapper.bean.UserInfoBean;
 import com.rv.member.presenter.MemberPresenter;
 import com.rv.component.utils.RvCache;
 import com.rv.component.utils.CacheEnum;
+import com.rv.member.view.MemberItemView;
+import com.rv.member.view.MemberTopView;
 import com.rv.tourism.bean.BeanTourOrderAliPay;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
@@ -53,7 +45,6 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
-import butterknife.OnClick;
 import io.reactivex.android.schedulers.AndroidSchedulers;
 import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
@@ -70,33 +61,17 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     private static final int REQUEST_VERIFIED = 10001;
     private static final int REQUEST_PAY = 10002;
 
-    @BindView(R2.id.iv_avatar)
-    RoundImageView ivAvatar;
-    @BindView(R2.id.tv_nickname)
-    TextView tvNickname;
-    @BindView(R2.id.tv_login)
-    TextView tvLogin;
-    @BindView(R2.id.recyclerView)
-    RecyclerView recyclerView;
-    @BindView(R2.id.tv_consume_record)
-    TextView tvConsumeRecord;
-    @BindView(R2.id.tv_free_day)
-    TextView tvFreeDay;
-    @BindView(R2.id.tv_purchase_record)
-    TextView tvPurchaseRecord;
-    @BindView(R2.id.rl_unlogin)
-    RelativeLayout rlUnLogin;
-    @BindView(R2.id.ll_login)
-    LinearLayout llLogin;
-    @BindView(R2.id.iv_member_level)
-    ImageView ivMember;
-
-    private MemberListAdapter adapter;
-    private UserInfoBean.UserInfo info;
+    @BindView(R2.id.member_top_view)
+    MemberTopView memberTopView;
+    @BindView(R2.id.ll_cardview_content)
+    LinearLayout ll_cardview_content;
+
     private IWXAPI api;
     private int memberLevel = 0; // 会员等级
     private int freeUseDay = 0; // 免费租车天数
-    private boolean verified = false; // 是否实名认证
+
+    private boolean hasAgree = false;
+
 
     public static Intent getIntent(Context context) {
         return new Intent(context, MemberCenterActivity.class);
@@ -107,26 +82,21 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
         return R.layout.activity_member;
     }
 
-    @Override
-    protected void onCreate(Bundle savedInstanceState) {
-        super.onCreate(savedInstanceState);
-        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
-    }
-
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
-        titleView.setTitle("会员中心");
         api = WXAPIFactory.createWXAPI(this, RvFrameConfig.APP_ID);
-        recyclerView.setLayoutManager(new LinearLayoutManager(this, LinearLayout.VERTICAL, false));
+        titleView.setTitle("会员中心");
         MemberListBean listBean = (MemberListBean) RvCache.getInstance().get(CacheEnum.MEMBER);
         if (listBean != null && listBean.getData() != null) {
-            adapter = new MemberListAdapter(listBean.getData(), memberLevel, freeUseDay, MemberCenterActivity.this, payListener);
-            recyclerView.setAdapter(adapter);
+            memberTopView.setData(listBean, memberLevel, freeUseDay, payListener);
+            addMemberList(listBean);
         }
-        UserInfoBean bean = (UserInfoBean) RvCache.getInstance().get(CacheEnum.USER);
-        if (bean != null) {
-            setUserInfoData(bean);
+        memberTopView.setLoginListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                isLogin();
             }
+        });
         initRxBus();
     }
 
@@ -192,17 +162,13 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                 MemberListBean listBean = (MemberListBean) result;
                 if (listBean != null && listBean.isRel() && listBean.getData() != null && !listBean.getData().isEmpty()) {
                     RvCache.getInstance().save(listBean, CacheEnum.MEMBER);
-                    if (adapter == null) {
-                        adapter = new MemberListAdapter(listBean.getData(), memberLevel, freeUseDay, MemberCenterActivity.this, payListener);
-                        recyclerView.setAdapter(adapter);
-                    } else {
-                        adapter.setDate(listBean.getData());
-                    }
+                    memberTopView.setData(listBean, memberLevel, freeUseDay, payListener);
+                    addMemberList(listBean);
                 }
                 break;
             case 1:
                 RvCache.getInstance().save((UserInfoBean) result, CacheEnum.USER);
-                setUserInfoData((UserInfoBean) result);
+                memberTopView.setUserInfoData((UserInfoBean) result);
                 break;
             case 2:
                 MemberOrderBean orderBean = (MemberOrderBean) result;
@@ -218,23 +184,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     }
 
 
-    @OnClick({R2.id.iv_avatar, R2.id.tv_login, R2.id.tv_consume_record, R2.id.tv_purchase_record, R2.id.tv_free_day})
-    public void onViewClicked(View view) {
-        int id = view.getId();
-        if (id == R.id.iv_avatar) {
-            //头像
-            if (!isLogin()) return;
-        } else if (id == R.id.tv_login) {
-            if (!isLogin()) return;
-        } else if (id == R.id.tv_consume_record) {
-            startActivity(new Intent(MemberCenterActivity.this, ConsumeRecordActivity.class));
-        } else if (id == R.id.tv_purchase_record) {
-            startActivity(new Intent(MemberCenterActivity.this, PurchaseRecordActivity.class));
-        } else if (id == R.id.tv_free_day) {
-//            startActivity(new Intent(MemberCenterActivity.this, FreesDayActivity.class));
-        }
-    }
-
     /**
      * 判断是否登录
      *
@@ -248,15 +197,6 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
         return true;
     }
 
-    private boolean isVerified() {
-        if (!verified) {
-            ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION)
-                    .navigation(this, REQUEST_VERIFIED);
-        }
-        return verified;
-    }
-
-
     @Override
     protected void loadData(Bundle savedInstanceState, Intent intent) {
         super.loadData(savedInstanceState, intent);
@@ -282,85 +222,19 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
         }
     }
 
-    private void setUserInfoData(UserInfoBean infoBean) {
-        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
-            rlUnLogin.setVisibility(View.VISIBLE);
-            llLogin.setVisibility(View.GONE);
-        } else {
-            rlUnLogin.setVisibility(View.GONE);
-            llLogin.setVisibility(View.VISIBLE);
-            if (infoBean != null) {
-                info = infoBean.getData();
-                if (info != null) {
-
-                    switch (info.getMemberLevel()) {
-                        case 1:
-//                            tvMember.setText("普通会员");
-                            break;
-                        case 2:
-//                            tvMember.setText("黄金会员");
-                            break;
-                        case 3:
-//                            tvMember.setText("钻石会员");
-                            break;
-                        default:
-                            break;
-                    }
-
-                    GlideManager.getInstance(this).loadImage(info.getHeadimgurl(), ivAvatar);
-                    tvNickname.setText(!TextUtils.isEmpty(info.getNickname()) ? info.getNickname() : info.getUsername());
-                    tvConsumeRecord.setText(info.getPayCount() + "\n 消费记录");
-                    tvFreeDay.setText(info.getRentFreeDays() + "\n 可免费租车 (天)");
-                    tvPurchaseRecord.setText(info.getBuyCount() + "\n 购买记录 (次)");
-                    if (!TextUtils.isEmpty(info.getIcon()))
-                        GlideManager.getInstance(getApplicationContext()).loadImage(info.getIcon(), ivMember);
+    private void addMemberList(MemberListBean listBean) {
+        ll_cardview_content.removeAllViews();
+        for (MemberListBean.MemberCard card : listBean.getData()) {
+            MemberItemView view = new MemberItemView(this);
+            view.setData(card);
+            view.setHasAgree(hasAgree);
+            view.setListener(payListener);
+            if (listBean.getData().indexOf(card) == listBean.getData().size() - 1)
+                view.hiddenLine();
+            ll_cardview_content.addView(view);
         }
     }
 
-
-        }
-
-        if (infoBean != null) {
-
-
-            if (info != null) {
-
-                ((View) ivMember.getParent()).setVisibility(View.VISIBLE);
-//                    ivMember.setVisibility(View.VISIBLE);
-
-                freeUseDay = info.getRentFreeDays();
-                if (info.getIsMember() == 0) {
-                    memberLevel = 0;
-                    if (adapter != null) {
-                        adapter.setMemberLevel(memberLevel, freeUseDay);
-                    }
-                    tvMember.setText("普通用户");
-//                        ivMember.setImageResource(R.drawable.mycenter_icon_goldmembership_1);
-                } else {
-                    memberLevel = info.getMemberLevel();
-                    if (adapter != null) {
-                        adapter.setMemberLevel(memberLevel, freeUseDay);
-                    }
-                    switch (info.getMemberLevel()) {
-                        case 1:
-                            tvMember.setText("普通会员");
-                            break;
-                        case 2:
-                            tvMember.setText("黄金会员");
-                            break;
-                        case 3:
-                            tvMember.setText("钻石会员");
-                            break;
-                        default:
-                            break;
-                    }
-                }
-            }
-        }
-    }
-
-}
-
     @Override
     protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -377,11 +251,10 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
 
 
     private int payType = 1;
-    private MemberListAdapter.PayListener payListener = new MemberListAdapter.PayListener() {
+    private PayListener payListener = new PayListener() {
         @Override
         public void pay(final MemberListBean.MemberCard card) {
             if (!isLogin()) return;
-//            if (!isVerified()) return;
             new PaymentTypeSelection(MemberCenterActivity.this) {
                 @Override
                 public void helper(final ViewHolder helper) {
@@ -411,5 +284,26 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                 }
             }.show();
         }
+
+        @Override
+        public void checkAgreement(boolean b) {
+            hasAgree = b;
+            int count = ll_cardview_content.getChildCount();
+            if (count > 0) {
+                for (int i = 0; i < count; i++) {
+                    View view = ll_cardview_content.getChildAt(i);
+                    if (view instanceof MemberItemView) {
+                        ((MemberItemView) view).setHasAgree(hasAgree);
+                    }
+                }
+            }
+        }
     };
+
+
+    public interface PayListener {
+        void pay(MemberListBean.MemberCard card);
+
+        void checkAgreement(boolean hasAgree);
+    }
 }
\ No newline at end of file

plugin_member/src/main/java/com/rv.member/adapter/GridMemerAdapter.java

@@ -4,12 +4,14 @@ import android.content.Context;
 import android.graphics.Color;
 import android.text.SpannableString;
 import android.text.Spanned;
+import android.text.TextUtils;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
 import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.BaseAdapter;
+import android.widget.LinearLayout;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
@@ -35,6 +37,11 @@ public class GridMemerAdapter extends BaseAdapter {
         this.mListener = listener;
     }
 
+    public void setDate(List<MemberListBean.MemberCard> data) {
+        mData = data;
+        notifyDataSetChanged();
+    }
+
     @Override
     public int getCount() {
         return mData.size();
@@ -61,7 +68,7 @@ public class GridMemerAdapter extends BaseAdapter {
             holder.tv_discount = view.findViewById(R.id.tv_discount);
             holder.tv_free_day = view.findViewById(R.id.tv_free_day);
             holder.tv_price = view.findViewById(R.id.tv_price);
-            holder.tv_type_icon = view.findViewById(R.id.tv_type_icon);
+            holder.tv_type = view.findViewById(R.id.tv_type);
             view.setTag(holder);
         } else {
             holder = (ViewHolder) view.getTag();
@@ -69,30 +76,36 @@ public class GridMemerAdapter extends BaseAdapter {
 
         SpannableString s = new SpannableString("¥" + memberCard.getPrice());
 
-        s.setSpan(new AbsoluteSizeSpan(12, true), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        s.setSpan(new AbsoluteSizeSpan(10, true), 0, 1, Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
         s.setSpan(new AbsoluteSizeSpan(18, true), 1, s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        s.setSpan(new ForegroundColorSpan(Color.parseColor("#FFB74B")), 1, s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+
+        if (selecPosition == i) {
+            s.setSpan(new ForegroundColorSpan(Color.parseColor("#ffffff")), 0, s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        } else {
+            s.setSpan(new ForegroundColorSpan(Color.parseColor("#999999")), 0, s.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        }
         holder.tv_price.setText(s);
 
         holder.tv_discount.setText("永久" + memberCard.getDiscount() / 10 + "折租车");
         holder.tv_free_day.setText(memberCard.getNumber() + "天免费租车");
+        holder.tv_type.setText(TextUtils.isEmpty(memberCard.getName()) ? "  " : memberCard.getName());
 
-        holder.tv_type_icon.setText(memberCard.getName());
-        switch (memberCard.getLevel()) {
-            case 1:
-                holder.tv_type_icon.setBackgroundResource(R.drawable.member_icon_reg_members);
-                break;
-            case 2:
-                holder.tv_type_icon.setBackgroundResource(R.drawable.member_icon_gold_membership);
-                break;
-            case 3:
-                holder.tv_type_icon.setBackgroundResource(R.drawable.member_icon_dia_membership);
-                break;
-        }
         if (selecPosition == i) {
-            holder.rl_content.setBackgroundResource(R.drawable.shape_rv_bg_member_selected);
+            if (i == 0) {
+                holder.rl_content.setBackgroundResource(R.drawable.bg_card_normal_member);
+            } else if (i == 1) {
+                holder.rl_content.setBackgroundResource(R.drawable.bg_card_gold_member);
+            } else if (i == 2) {
+                holder.rl_content.setBackgroundResource(R.drawable.bg_card_diamond_member);
+            }
+            holder.tv_type.setTextColor(Color.WHITE);
+            holder.tv_discount.setTextColor(Color.WHITE);
+            holder.tv_free_day.setTextColor(Color.WHITE);
         } else {
-            holder.rl_content.setBackgroundResource(R.drawable.shape_rv_bg_member_unselected);
+            holder.rl_content.setBackgroundResource(R.drawable.bg_member_unselect);
+            holder.tv_type.setTextColor(Color.parseColor("#999999"));
+            holder.tv_discount.setTextColor(Color.parseColor("#999999"));
+            holder.tv_free_day.setTextColor(Color.parseColor("#999999"));
         }
 
         holder.rl_content.setOnClickListener(new View.OnClickListener() {
@@ -107,10 +120,10 @@ public class GridMemerAdapter extends BaseAdapter {
     }
 
     private class ViewHolder {
-        RelativeLayout rl_content;
+        LinearLayout rl_content;
+        TextView tv_type;
         TextView tv_price;
         TextView tv_discount;
         TextView tv_free_day;
-        TextView tv_type_icon;
     }
 }

plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java

-package com.rv.member.adapter;
-
-import android.content.ComponentName;
-import android.content.Context;
-import android.content.Intent;
-import android.graphics.Color;
-import android.support.annotation.NonNull;
-import android.support.annotation.Nullable;
-import android.support.v7.widget.RecyclerView;
-import android.text.SpannableString;
-import android.text.Spanned;
-import android.text.TextUtils;
-import android.text.style.ForegroundColorSpan;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.Button;
-import android.widget.GridView;
-import android.widget.ImageView;
-import android.widget.RelativeLayout;
-import android.widget.TextView;
-import android.widget.Toast;
-
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.frame.base.url.Constance;
-import com.ruiwenliu.wrapper.util.glide.GlideManager;
-
-import com.rv.member.R;
-import com.rv.member.bean.MemberListBean;
-import com.rv.member.view.MemberCardView;
-import com.rv.tourism.api.TourismApi;
-
-import java.util.List;
-
-public class MemberListAdapter extends RecyclerView.Adapter<RecyclerView.ViewHolder> {
-
-    private Context mContext;
-    private List<MemberListBean.MemberCard> mData;
-    private PayListener payListener;
-    private int memberLevel;
-    private int freeUseDay;
-    private GridMemerAdapter adapter;
-    private MemberListBean.MemberCard selectCard;
-    private int selectPostion;
-
-    public interface PayListener {
-        void pay(MemberListBean.MemberCard card);
-    }
-
-    public void setMemberLevel(int memberLevel, int freeUseDay) {
-        this.memberLevel = memberLevel;
-        this.freeUseDay = freeUseDay;
-        notifyDataSetChanged();
-    }
-
-    public void setDate(List<MemberListBean.MemberCard> data) {
-        initData(data);
-        notifyDataSetChanged();
-    }
-
-    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;
-        initData(data);
-    }
-
-    private void initData(List<MemberListBean.MemberCard> data) {
-        data.add(0, null);
-        mData = data;
-        selectCard = mData.get(selectPostion);
-    }
-
-
-    @Override
-    public RecyclerView.ViewHolder onCreateViewHolder(@NonNull ViewGroup viewGroup, int i) {
-
-        if (i == 0) {
-            return new HeadViewHolder(LayoutInflater.from(mContext).inflate(R.layout.view_member_privilege, viewGroup, false));
-        }
-        return new CommonViewHolder(LayoutInflater.from(mContext).inflate(R.layout.item_member_detail, viewGroup, false));
-    }
-
-    @Override
-    public void onBindViewHolder(@NonNull RecyclerView.ViewHolder viewHolder, int i) {
-
-        MemberListBean.MemberCard bean = mData.get(i);
-        if (bean == null) {
-            setHeadViewData((HeadViewHolder) viewHolder);
-        } else {
-            setCommonViewData((CommonViewHolder) viewHolder, bean);
-        }
-    }
-
-    @Override
-    public int getItemCount() {
-        return mData.size();
-    }
-
-    @Override
-    public int getItemViewType(int position) {
-        if (mData.get(position) == null) {
-            return 0;
-        }
-        return 1;
-    }
-
-
-    /*******
-     * 是否已经同意协议
-     */
-    private boolean hasAgree = false;
-
-    private void setHeadViewData(final HeadViewHolder viewHolder) {
-        setMemeberTop(viewHolder);
-        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) {
-                ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
-                        .withString("title", "合同协议")
-                        .withString("url", TourismApi.HTTP_URL_CAR_TYPE_NOTICE)
-                        .withInt("type", 18)
-                        .navigation();
-            }
-        });
-
-        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);
-        viewHolder.img_agree.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                if (hasAgree) {
-                    hasAgree = false;
-                    viewHolder.img_agree.setImageResource(R.drawable.common_icon_radio_unche);
-                    viewHolder.btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_btn_grap_yellow);
-                } else {
-                    hasAgree = true;
-                    viewHolder.img_agree.setImageResource(R.drawable.common_icon_selected);
-                    viewHolder.btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_dark_yellow);
-                }
-            }
-        });
-
-        viewHolder.btn_buy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-
-                if (!hasAgree) {
-                    Toast.makeText(mContext, "需同意服务协议", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                if (payListener != null) {
-                    payListener.pay(selectCard);
-                }
-            }
-        });
-        initGridView(viewHolder);
-        viewHolder.btn_buy.setText("立即开通" + selectCard.getName());
-        viewHolder.btnDisountUse.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                toMainActivity();
-            }
-        });
-
-        viewHolder.btnFreedayUse.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                toMainActivity();
-            }
-        });
-    }
-
-    private void toMainActivity() {
-        ComponentName componentName = new ComponentName(mContext, "com.xxfc.rv.MainActivity");
-        Intent intent = new Intent();
-        intent.putExtra("to", "home");
-        intent.setComponent(componentName);
-        mContext.startActivity(intent);
-    }
-
-    private void initGridView(final HeadViewHolder viewHolder) {
-
-        viewHolder.gridview.setNumColumns(mData.size() - 1);
-
-        if (adapter == null) {
-            adapter = new GridMemerAdapter(mContext, mData.subList(1, mData.size()), new GridMemerAdapter.SelectListener() {
-                @Override
-                public void select(MemberListBean.MemberCard memberCard) {
-                    selectCard = memberCard;
-                    selectPostion = mData.indexOf(memberCard);
-                    viewHolder.btn_buy.setText("立即开通" + memberCard.getName());
-                }
-            });
-        }
-        viewHolder.gridview.setAdapter(adapter);
-    }
-
-    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折");
-                    break;
-                case 2:
-                    viewHolder.imgDiscountTop.setImageResource(R.drawable.member_discount_7);
-                    viewHolder.tvDiscountTop.setText("租车7折");
-                    break;
-                case 3:
-                    viewHolder.imgDiscountTop.setImageResource(R.drawable.member_discount_6);
-                    viewHolder.tvDiscountTop.setText("租车6折");
-                    break;
-            }
-        } else {
-            viewHolder.rlTop.setVisibility(View.GONE);
-        }
-    }
-
-    protected void setCommonViewData(CommonViewHolder viewHolder, final MemberListBean.MemberCard bean) {
-        if (!TextUtils.isEmpty(bean.getName())) {
-            viewHolder.tv_member_type.setText(bean.getName());
-            viewHolder.btn_buy.setText("立即开通" + bean.getName());
-        }
-
-        viewHolder.btn_buy.setOnClickListener(new View.OnClickListener() {
-            @Override
-            public void onClick(View view) {
-                if (!hasAgree) {
-                    Toast.makeText(mContext, "需同意服务协议", Toast.LENGTH_SHORT).show();
-                    return;
-                }
-                if (payListener != null) {
-
-                    payListener.pay(bean);
-                }
-            }
-        });
-        if (!TextUtils.isEmpty(bean.getIcon()))
-            GlideManager.getInstance(mContext).loadImage(bean.getIcon(), viewHolder.img_icon);
-
-        SpannableString spannableString = new SpannableString(bean.getName() + bean.getPrice() + "元 (永久)");
-        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#F25B5B")), bean.getName().length(), spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
-        viewHolder.tv_member_type_price_time.setText(spannableString);
-
-        if (!TextUtils.isEmpty(bean.getDescribe())) {
-            viewHolder.tv_describe.setText(bean.getDescribe());
-        }
-        viewHolder.mcv_discount.setValue(bean.getDiscount());
-        viewHolder.mcv_free_day.setValue(bean.getNumber());
-    }
-
-    public class HeadViewHolder extends RecyclerView.ViewHolder {
-
-        GridView gridview;
-        TextView tv_agreement;
-        ImageView img_agree;
-        Button btn_buy;
-        RelativeLayout rlTop;
-        ImageView imgDiscountTop;
-        TextView tvDiscountTop;
-        Button btnDisountUse;
-        TextView imgFreedayTop;
-        TextView tvFreedayTop;
-        Button btnFreedayUse;
-
-        public HeadViewHolder(@NonNull View itemView) {
-            super(itemView);
-            gridview = itemView.findViewById(R.id.gridview);
-            tv_agreement = itemView.findViewById(R.id.tv_agreement);
-            img_agree = itemView.findViewById(R.id.img_agree);
-            btn_buy = itemView.findViewById(R.id.btn_buy);
-            rlTop = itemView.findViewById(R.id.rl_member_top);
-            imgDiscountTop = itemView.findViewById(R.id.img_discount_top);
-            tvDiscountTop = itemView.findViewById(R.id.tv_discount_top);
-            btnDisountUse = itemView.findViewById(R.id.btn_disount_use);
-            imgFreedayTop = itemView.findViewById(R.id.img_freeday_top);
-            tvFreedayTop = itemView.findViewById(R.id.tv_freeday_top);
-            btnFreedayUse = itemView.findViewById(R.id.btn_freeday_use);
-        }
-    }
-
-    public class CommonViewHolder extends RecyclerView.ViewHolder {
-        TextView tv_member_type;
-        MemberCardView mcv_discount, mcv_free_day, mcv_free_outdoors;
-        ImageView img_icon;
-        TextView tv_member_type_price_time;
-        TextView tv_describe;
-        Button btn_buy;
-
-        public CommonViewHolder(@NonNull View itemView) {
-            super(itemView);
-            tv_member_type = itemView.findViewById(R.id.tv_member_type);
-            mcv_discount = itemView.findViewById(R.id.mcv_discount);
-            mcv_free_day = itemView.findViewById(R.id.mcv_free_day);
-            mcv_free_outdoors = itemView.findViewById(R.id.mcv_free_outdoors);
-            img_icon = itemView.findViewById(R.id.img_icon);
-            tv_member_type_price_time = itemView.findViewById(R.id.tv_member_type_price_time);
-            tv_describe = itemView.findViewById(R.id.tv_describe);
-            btn_buy = itemView.findViewById(R.id.btn_buy);
-        }
-    }
-}

plugin_member/src/main/java/com/rv.member/view/LoginView.java

+package com.rv.member.view;
+
+import android.content.Context;
+import android.graphics.Typeface;
+import android.text.SpannableStringBuilder;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.TextAppearanceSpan;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+
+import com.base.utils.ui.image.round.RoundImageView;
+import com.ruiwenliu.wrapper.bean.UserInfoBean;
+import com.ruiwenliu.wrapper.util.glide.GlideManager;
+import com.rv.component.utils.DisplayUtil;
+import com.rv.member.R;
+
+public class LoginView extends LinearLayout {
+
+    private LinearLayout llLogin;
+    private RoundImageView ivAvatar;
+    private TextView tvNickname;
+    private ImageView ivMemberLevel;
+    private TextView tvConsumeRecord;
+    private TextView tvFreeDay;
+    private TextView tvPurchaseRecord;
+
+    private UserInfoBean infoBean;
+
+    public LoginView(Context context) {
+        super(context);
+        initView();
+    }
+
+    public LoginView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public void setData(UserInfoBean infoBean) {
+        this.infoBean = infoBean;
+        setViewData();
+    }
+
+    private void setViewData() {
+        if (infoBean != null) {
+            UserInfoBean.UserInfo info = infoBean.getData();
+            if (info != null) {
+                if (info.getIsMember() == 0) {
+                    llLogin.setBackgroundResource(R.drawable.bg_normal_user);
+                    ivMemberLevel.setVisibility(GONE);
+                } else {
+                    switch (info.getMemberLevel()) {
+                        case 1:
+                            llLogin.setBackgroundResource(R.drawable.bg_normal_member);
+                            break;
+                        case 2:
+                            llLogin.setBackgroundResource(R.drawable.bg_gold_member);
+                            break;
+                        case 3:
+                            llLogin.setBackgroundResource(R.drawable.bg_diamond_member);
+                            break;
+                        default:
+                            break;
+                    }
+                }
+
+                GlideManager.getInstance(getContext()).loadImage(info.getHeadimgurl(), ivAvatar);
+                tvNickname.setText(!TextUtils.isEmpty(info.getNickname()) ? info.getNickname() : info.getUsername());
+
+                SpannableStringBuilder recordBuilder = new SpannableStringBuilder(info.getPayCount() + "\n 消费记录") ;
+                recordBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(getContext(), 18), null, null), 0, String.valueOf(info.getPayCount()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+                tvConsumeRecord.setText(recordBuilder);
+
+                SpannableStringBuilder rentBuilder = new SpannableStringBuilder(info.getRentFreeDays() + "\n 可免费租车 (天)") ;
+                rentBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(getContext(), 18), null, null), 0, String.valueOf(info.getRentFreeDays()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+
+                tvFreeDay.setText(rentBuilder);
+
+                SpannableStringBuilder bugBuilder = new SpannableStringBuilder(info.getBuyCount() + "\n 购买记录 (次)") ;
+                bugBuilder.setSpan(new TextAppearanceSpan(null, Typeface.NORMAL, DisplayUtil.sp2px(getContext(), 18), null, null), 0, String.valueOf(info.getBuyCount()).length(), Spanned.SPAN_EXCLUSIVE_INCLUSIVE);
+                tvPurchaseRecord.setText(bugBuilder);
+                if (!TextUtils.isEmpty(info.getIcon()))
+                    GlideManager.getInstance(getContext()).loadImage(info.getIcon(), ivMemberLevel);
+            }
+        }
+    }
+
+
+    private void initView() {
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.item_login_view, null);
+        llLogin = view.findViewById(R.id.ll_login);
+        ivAvatar = view.findViewById(R.id.iv_avatar);
+        tvNickname = view.findViewById(R.id.tv_nickname);
+        ivMemberLevel = view.findViewById(R.id.iv_member_level);
+        tvConsumeRecord = view.findViewById(R.id.tv_consume_record);
+        tvFreeDay = view.findViewById(R.id.tv_free_day);
+        tvPurchaseRecord = view.findViewById(R.id.tv_purchase_record);
+        addView(view);
+    }
+}

plugin_member/src/main/java/com/rv.member/view/MemberCardView.java

@@ -21,15 +21,21 @@ public class MemberCardView extends LinearLayout {
     private int type = 0;
 
     private int[] imgDiscounts = {
-            R.drawable.member_discount_6,
-            R.drawable.member_discount_7,
-            R.drawable.member_discount_8
+            R.drawable.icon_vip_normal,
+            R.drawable.icon_vip_gold,
+            R.drawable.icon_vip_diamond
     };
 
     private int[] imgFreeDays = {
-            R.drawable.member_free_day_5,
-            R.drawable.member_free_day_12,
-            R.drawable.member_free_day_28
+            R.drawable.icon_car_normal,
+            R.drawable.icon_car_gold,
+            R.drawable.icon_car_diamond
+    };
+
+    private int[] imgOutDoors = {
+            R.drawable.icon_outdoor_normal,
+            R.drawable.icon_outdoor_gold,
+            R.drawable.icon_outdoor_diamond
     };
 
     public MemberCardView(Context context, AttributeSet attrs) {
@@ -50,7 +56,7 @@ public class MemberCardView extends LinearLayout {
             text = "%d天免费用车";
         } else if (type == 2) {
             tvText.setText(R.string.tv_outdoors_act);
-            imgIcon.setImageResource(R.drawable.member_icon_free);
+//            imgIcon.setImageResource(imgOutDoors[]);
         }
         addView(view);
     }
@@ -63,7 +69,7 @@ public class MemberCardView extends LinearLayout {
         if (tvText != null && imgIcon != null) {
             switch (type) {
                 case 0:
-                    if (value == 60) {
+                    if (value == 80) {
                         res = imgDiscounts[0];
                     } else if (value == 70) {
                         res = imgDiscounts[1];
@@ -81,6 +87,16 @@ public class MemberCardView extends LinearLayout {
                         res = imgFreeDays[0];
                     tvText.setText(String.format(text, value));
                     imgIcon.setImageResource(res);
+                    break;
+                case 2:
+                    if(value == 1){
+                        imgIcon.setImageResource(imgOutDoors[0]);
+                    }else if(value == 2){
+                        imgIcon.setImageResource(imgOutDoors[1]);
+                    }else if(value == 3){
+                        imgIcon.setImageResource(imgOutDoors[2]);
+                    }
+
                     break;
                 default:
                     break;

plugin_member/src/main/java/com/rv.member/view/MemberItemView.java

+package com.rv.member.view;
+
+import android.content.Context;
+import android.text.TextUtils;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.rv.member.MemberCenterActivity;
+import com.rv.member.R;
+import com.rv.member.bean.MemberListBean;
+
+public class MemberItemView extends LinearLayout {
+
+    private TextView tv_member_type;
+    private MemberCardView mcv_discount, mcv_free_day, mcv_free_outdoors;
+    private TextView tv_describe;
+    private Button btn_buy;
+    private View viewLine;
+
+    private boolean hasAgree = false;
+    private MemberCenterActivity.PayListener listener;
+
+    private MemberListBean.MemberCard memberCard = null;
+
+    public MemberItemView(Context context) {
+        super(context);
+        initView();
+    }
+
+    public MemberItemView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public void setHasAgree(boolean hasAgree) {
+        this.hasAgree = hasAgree;
+    }
+
+    public void setData(MemberListBean.MemberCard card) {
+        this.memberCard = card;
+        setData();
+    }
+
+    public void setListener(MemberCenterActivity.PayListener listener) {
+        this.listener = listener;
+    }
+
+    public void hiddenLine() {
+        if (viewLine != null) viewLine.setVisibility(GONE);
+    }
+
+    private void initView() {
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.item_member_detail, null);
+        tv_member_type = view.findViewById(R.id.tv_member_type);
+        mcv_discount = view.findViewById(R.id.mcv_discount);
+        mcv_free_day = view.findViewById(R.id.mcv_free_day);
+        mcv_free_outdoors = view.findViewById(R.id.mcv_free_outdoors);
+        tv_describe = view.findViewById(R.id.tv_describe);
+        btn_buy = view.findViewById(R.id.btn_buy);
+        viewLine = view.findViewById(R.id.view_line);
+        addView(view);
+    }
+
+    private void setData() {
+        if (!TextUtils.isEmpty(memberCard.getName())) {
+            tv_member_type.setText(memberCard.getName());
+            btn_buy.setText("立即开通" + memberCard.getName());
+            if (memberCard.getLevel() == 1) {
+                btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_normal_member);
+            } else if (memberCard.getLevel() == 2) {
+                btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_gold_member);
+            } else {
+                btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_diamond_member);
+            }
+        }
+
+        btn_buy.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                if (!hasAgree) {
+                    Toast.makeText(getContext(), "需同意服务协议", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (listener != null) {
+                    listener.pay(memberCard);
+                }
+            }
+        });
+        if (!TextUtils.isEmpty(memberCard.getDescribe())) {
+            tv_describe.setText(memberCard.getDescribe());
+        }
+        mcv_discount.setValue(memberCard.getDiscount());
+        mcv_free_day.setValue(memberCard.getNumber());
+        mcv_free_outdoors.setValue(memberCard.getLevel());
+    }
+}

plugin_member/src/main/java/com/rv.member/view/MemberTopView.java

+package com.rv.member.view;
+
+import android.content.ComponentName;
+import android.content.Context;
+import android.content.Intent;
+import android.graphics.Color;
+import android.text.SpannableString;
+import android.text.Spanned;
+import android.text.TextUtils;
+import android.text.style.ForegroundColorSpan;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.Button;
+import android.widget.GridView;
+import android.widget.ImageView;
+import android.widget.LinearLayout;
+import android.widget.TextView;
+import android.widget.Toast;
+
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.url.Constance;
+import com.ruiwenliu.wrapper.bean.UserInfoBean;
+import com.rv.component.utils.CacheEnum;
+import com.rv.component.utils.RvCache;
+import com.rv.member.MemberCenterActivity;
+import com.rv.member.R;
+import com.rv.member.adapter.GridMemerAdapter;
+import com.rv.member.bean.MemberListBean;
+import com.rv.tourism.api.TourismApi;
+import com.yuyife.okgo.OkGoUtil;
+
+public class MemberTopView extends LinearLayout {
+
+    private UnLoginView unlogin_view;
+    private LoginView logined_view;
+    private TextView tv_agreement;
+    private ImageView img_agree;
+    private Button btn_buy;
+    private LinearLayout llTop;
+    private ImageView imgDiscountTop;
+    private TextView tvDiscountTop;
+    private Button btnDisountUse;
+    private ImageView imgFreedayTop;
+    private TextView tvFreedayTop;
+    private Button btnFreedayUse;
+    private ImageView imgFreeTop;
+    private TextView tvFreeTop;
+    private GridView gridview;
+    private MemberListBean bean;
+    private View viewLine;
+
+
+    private MemberListBean.MemberCard selectCard;
+    private int selectPostion;
+    private MemberCenterActivity.PayListener listener;
+    private int memberLevel;
+    private int freeUseDay;
+
+    private GridMemerAdapter adapter;
+
+    private UserInfoBean.UserInfo info;
+
+    private boolean hasAgree = false;
+
+    private OnClickListener clickListener;
+
+    public MemberTopView(Context context) {
+        super(context);
+    }
+
+    public MemberTopView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public void setData(MemberListBean bean, int memberLevel, int freeUseDay, MemberCenterActivity.PayListener listener) {
+        this.bean = bean;
+        this.listener = listener;
+        this.memberLevel = memberLevel;
+        this.freeUseDay = freeUseDay;
+        selectPostion = 0;
+        selectCard = bean.getData().get(selectPostion);
+        setHeadViewData();
+    }
+
+    public void setLoginListener(OnClickListener clickListener) {
+        this.clickListener = clickListener;
+        unlogin_view.setLoginListener(clickListener);
+    }
+
+    private void initView() {
+
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.view_member_top, null);
+        unlogin_view = view.findViewById(R.id.unlogin_view);
+        logined_view = view.findViewById(R.id.logined_view);
+        gridview = view.findViewById(R.id.gridview);
+        tv_agreement = view.findViewById(R.id.tv_agreement);
+        img_agree = view.findViewById(R.id.img_agree);
+        btn_buy = view.findViewById(R.id.btn_buy);
+        llTop = view.findViewById(R.id.ll_member_top);
+        imgDiscountTop = view.findViewById(R.id.img_discount_top);
+        tvDiscountTop = view.findViewById(R.id.tv_discount_top);
+        btnDisountUse = view.findViewById(R.id.btn_disount_use);
+        imgFreedayTop = view.findViewById(R.id.img_freeday_top);
+        tvFreedayTop = view.findViewById(R.id.tv_freeday_top);
+        btnFreedayUse = view.findViewById(R.id.btn_freeday_use);
+        imgFreeTop = view.findViewById(R.id.img_free_top);
+        tvFreeTop = view.findViewById(R.id.tv_free_top);
+        viewLine = view.findViewById(R.id.view_line);
+        if (TextUtils.isEmpty(OkGoUtil.getToken())) {
+            unlogin_view.setVisibility(View.VISIBLE);
+            logined_view.setVisibility(View.GONE);
+        } else {
+            UserInfoBean userInfoBean = (UserInfoBean) RvCache.getInstance().get(CacheEnum.USER);
+            if (userInfoBean != null) {
+                setUserInfoData(userInfoBean);
+            }
+        }
+
+        addView(view);
+    }
+
+
+    private void setHeadViewData() {
+        setMemeberTop();
+        SpannableString spannableString = new SpannableString(tv_agreement.getText());
+        spannableString.setSpan(new ForegroundColorSpan(Color.parseColor("#309EFF")), 4, spannableString.length(), Spanned.SPAN_EXCLUSIVE_EXCLUSIVE);
+        tv_agreement.setText(spannableString);
+        tv_agreement.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_WEBVIEW)
+                        .withString("title", "合同协议")
+                        .withString("url", TourismApi.HTTP_URL_CAR_TYPE_NOTICE)
+                        .withInt("type", 18)
+                        .navigation();
+            }
+        });
+
+        img_agree.setImageResource(hasAgree ? R.drawable.common_icon_selected : R.drawable.common_icon_radio_unche);
+        if (selectCard.getLevel() == 1) {
+            btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_normal_member);
+        } else if (selectCard.getLevel() == 2) {
+            btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_gold_member);
+        } else {
+            btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_diamond_member);
+        }
+        img_agree.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (hasAgree) {
+                    hasAgree = false;
+                    img_agree.setImageResource(R.drawable.common_icon_radio_unche);
+                } else {
+                    hasAgree = true;
+                    img_agree.setImageResource(R.drawable.common_icon_selected);
+                }
+                if (listener != null) {
+                    listener.checkAgreement(hasAgree);
+                }
+
+            }
+        });
+
+        btn_buy.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+
+                if (!hasAgree) {
+                    Toast.makeText(getContext(), "需同意服务协议", Toast.LENGTH_SHORT).show();
+                    return;
+                }
+                if (listener != null) {
+                    listener.pay(selectCard);
+                }
+            }
+        });
+        initGridView();
+        btn_buy.setText("立即开通" + selectCard.getName());
+        btnDisountUse.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                toMainActivity();
+            }
+        });
+
+        btnFreedayUse.setOnClickListener(new View.OnClickListener() {
+            @Override
+            public void onClick(View view) {
+                toMainActivity();
+            }
+        });
+    }
+
+    private void setMemeberTop() {
+        if (memberLevel > 0) {
+            llTop.setVisibility(VISIBLE);
+            viewLine.setVisibility(VISIBLE);
+            tvFreedayTop.setText("免费用车" + freeUseDay + "天");
+
+            switch (memberLevel) {
+                case 1:
+                    imgDiscountTop.setImageResource(R.drawable.icon_vip_normal);
+                    imgFreedayTop.setImageResource(R.drawable.icon_car_normal);
+                    imgFreeTop.setImageResource(R.drawable.icon_outdoor_normal);
+                    tvDiscountTop.setText("租车8折");
+                    break;
+                case 2:
+                    imgDiscountTop.setImageResource(R.drawable.icon_vip_gold);
+                    imgFreedayTop.setImageResource(R.drawable.icon_car_gold);
+                    imgFreeTop.setImageResource(R.drawable.icon_outdoor_gold);
+                    tvDiscountTop.setText("租车7折");
+                    break;
+                case 3:
+                    imgDiscountTop.setImageResource(R.drawable.icon_vip_diamond);
+                    imgFreedayTop.setImageResource(R.drawable.icon_car_diamond);
+                    imgFreeTop.setImageResource(R.drawable.icon_outdoor_diamond);
+                    tvDiscountTop.setText("租车6折");
+                    break;
+            }
+        } else {
+            viewLine.setVisibility(GONE);
+            llTop.setVisibility(GONE);
+        }
+    }
+
+    public void setUserInfoData(UserInfoBean infoBean) {
+        if (infoBean != null) {
+            info = infoBean.getData();
+            if (info != null) {
+                unlogin_view.setVisibility(View.GONE);
+                logined_view.setData(infoBean);
+                logined_view.setVisibility(View.VISIBLE);
+
+                if (info.getIsMember() == 0) {
+                    memberLevel = 0;
+                    setMemeberTop();
+                } else {
+                    memberLevel = info.getMemberLevel();
+                    setMemeberTop();
+                }
+            }
+        }
+    }
+
+    private void initGridView() {
+        gridview.setNumColumns(bean.getData().size());
+        if (adapter == null) {
+            adapter = new GridMemerAdapter(getContext(), bean.getData(), new GridMemerAdapter.SelectListener() {
+                @Override
+                public void select(MemberListBean.MemberCard memberCard) {
+                    selectCard = memberCard;
+                    selectPostion = bean.getData().indexOf(memberCard);
+                    btn_buy.setText("立即开通" + memberCard.getName());
+
+                    if (selectCard.getLevel() == 1) {
+                        btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_normal_member);
+                    } else if (selectCard.getLevel() == 2) {
+                        btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_gold_member);
+                    } else {
+                        btn_buy.setBackgroundResource(R.drawable.shape_rv_bg_open_diamond_member);
+                    }
+                }
+            });
+        }
+        gridview.setAdapter(adapter);
+    }
+
+    private void toMainActivity() {
+        ComponentName componentName = new ComponentName(getContext(), "com.xxfc.rv.MainActivity");
+        Intent intent = new Intent();
+        intent.putExtra("to", "home");
+        intent.setComponent(componentName);
+        getContext().startActivity(intent);
+    }
+}

plugin_member/src/main/java/com/rv.member/view/UnLoginView.java

+package com.rv.member.view;
+
+import android.content.Context;
+import android.util.AttributeSet;
+import android.view.LayoutInflater;
+import android.view.View;
+import android.widget.RelativeLayout;
+import android.widget.TextView;
+
+import com.rv.member.R;
+
+public class UnLoginView extends RelativeLayout {
+    private TextView tvLogin;
+    private OnClickListener onClickListener;
+
+    public UnLoginView(Context context) {
+        super(context);
+        initView();
+    }
+
+    public UnLoginView(Context context, AttributeSet attrs) {
+        super(context, attrs);
+        initView();
+    }
+
+    public void setLoginListener(OnClickListener listener) {
+        this.onClickListener = listener;
+    }
+
+    private void initView() {
+        View view = LayoutInflater.from(getContext()).inflate(R.layout.item_unlogin_view, null);
+        tvLogin = view.findViewById(R.id.tv_login);
+        tvLogin.setOnClickListener(new OnClickListener() {
+            @Override
+            public void onClick(View v) {
+                if (onClickListener != null) onClickListener.onClick(v);
+            }
+        });
+        addView(view);
+    }
+}

plugin_member/src/main/res/drawable/shape_member_bg_btn_yellow.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!--空心框 圆角 少量红-->
+    <corners android:radius="@dimen/size_30" />
+    <solid android:color="#FFC772" />
+</shape>
\ No newline at end of file

plugin_member/src/main/res/drawable/shape_rv_bg_top_unlogin.xml

@@ -5,6 +5,6 @@
     <gradient
         android:startColor="#E5B895"
         android:endColor="#F8D3B8"
-        android:angle="90"
+        android:angle="0"
         />
 </shape>
\ No newline at end of file

plugin_member/src/main/res/layout/activity_member.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:orientation="vertical">
 
+    <ScrollView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
 
         <LinearLayout
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/dp_10"
-        android:layout_marginTop="@dimen/size_15"
-        android:layout_marginRight="@dimen/dp_10"
-        android:layout_marginBottom="13dp"
             android:orientation="vertical">
 
-        <RelativeLayout
-            android:id="@+id/rl_unlogin"
+            <com.rv.member.view.MemberTopView
+                android:id="@+id/member_top_view"
                 android:layout_width="match_parent"
-            android:layout_height="100dp"
-            android:background="@drawable/shape_rv_bg_top_unlogin"
-            android:gravity="center"
-            android:orientation="horizontal">
-
-            <com.base.utils.ui.image.round.RoundImageView
-                android:id="@+id/iv_avatar_default"
-                android:layout_width="@dimen/size_60"
-                android:layout_height="@dimen/size_60"
-                android:layout_alignParentLeft="true"
-                android:layout_centerVertical="true"
-                android:layout_marginLeft="@dimen/size_15"
-                android:src="@drawable/common_icon_avatar_default" />
-
-            <TextView
-                android:id="@+id/tv_login"
-                android:layout_width="@dimen/size_100"
-                android:layout_height="33.33dp"
-                android:layout_alignParentRight="true"
-                android:layout_centerVertical="true"
-                android:layout_gravity="center"
-                android:layout_marginRight="@dimen/size_15"
-                android:background="@drawable/shape_rv_bg_circle_white"
-                android:gravity="center"
-                android:text="@string/tv_login"
-                android:textColor="@color/colorYellow"
-                android:textSize="@dimen/text_14" />
-
-        </RelativeLayout>
+                android:layout_height="wrap_content" />
 
             <LinearLayout
-            android:id="@+id/ll_login"
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
-            android:background="@drawable/shape_rv_bg_top_unlogin"
-            android:gravity="center"
+                android:background="#F2F2F2"
                 android:orientation="vertical">
 
-            <RelativeLayout
+                <LinearLayout
                     android:layout_width="match_parent"
-                android:layout_height="wrap_content">
+                    android:layout_height="wrap_content"
+                    android:layout_marginTop="@dimen/size_8"
+                    android:layout_marginBottom="@dimen/size_8"
+                    android:gravity="center"
+                    android:orientation="horizontal">
 
-                <com.base.utils.ui.image.round.RoundImageView
-                    android:id="@+id/iv_avatar"
-                    android:layout_width="@dimen/size_60"
-                    android:layout_height="@dimen/size_60"
-                    android:layout_alignParentLeft="true"
-                    android:layout_centerVertical="true"
-                    android:layout_margin="@dimen/dp_10"
-                    android:src="@drawable/common_icon_avatar_default" />
+                    <ImageView
+                        android:layout_width="wrap_content"
+                        android:layout_height="wrap_content"
+                        android:src="@drawable/member_icon_small_yellow_circle" />
 
                     <TextView
-                    android:id="@+id/tv_nickname"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                    android:layout_centerVertical="true"
-                    android:layout_toRightOf="@id/iv_avatar"
-                    android:ellipsize="end"
-                    android:maxLength="10"
-                    android:text="xxxxxx"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/text_16" />
+                        android:layout_marginLeft="5dp"
+                        android:layout_marginRight="5dp"
+                        android:text="会员特权"
+                        android:textColor="@color/colorMain"
+                        android:textSize="16sp"
+                        android:textStyle="bold" />
 
                     <ImageView
-                    android:id="@+id/iv_member_level"
-                    android:layout_width="@dimen/size_60"
-                    android:layout_height="@dimen/size_60"
-                    android:layout_alignParentRight="true"
-                    android:layout_marginRight="@dimen/dp_40" />
-
-            </RelativeLayout>
-
-            <LinearLayout
-                android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:gravity="center_vertical"
-                android:orientation="horizontal"
-                android:paddingLeft="@dimen/size_15"
-                android:paddingRight="@dimen/size_15">
+                        android:src="@drawable/member_icon_small_yellow_circle" />
 
-                <TextView
-                    android:id="@+id/tv_consume_record"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_alignParentLeft="true"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:lines="2"
-                    android:text="0 \n 消费记录 "
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_14" />
 
-                <View
-                    android:layout_width="1px"
-                    android:layout_height="match_parent"
-                    android:background="@color/white" />
+                </LinearLayout>
 
-                <TextView
-                    android:id="@+id/tv_free_day"
-                    android:layout_width="0dp"
-                    android:layout_height="wrap_content"
-                    android:layout_centerInParent="true"
-                    android:layout_weight="1"
-                    android:gravity="center"
-                    android:lines="2"
-                    android:text="0 \n 可免费租车 (天) "
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_14" />
 
-                <View
-                    android:layout_width="1px"
-                    android:layout_height="match_parent"
-                    android:background="@color/white" />
+                <android.support.v7.widget.CardView
+                    android:layout_width="match_parent"
+                    android:layout_height="wrap_content"
+                    android:layout_marginLeft="@dimen/dp_10"
+                    android:layout_marginRight="@dimen/dp_10"
+                    android:background="@color/white"
+                    app:cardCornerRadius="@dimen/dp_10">
 
-                <TextView
-                    android:id="@+id/tv_purchase_record"
-                    android:layout_width="0dp"
+                    <LinearLayout
+                        android:id="@+id/ll_cardview_content"
+                        android:layout_width="match_parent"
                         android:layout_height="wrap_content"
-                    android:layout_alignParentRight="true"
-                    android:layout_weight="1"
-                    android:gravity="center_horizontal|bottom"
-                    android:lines="2"
-                    android:text="0 \n 购买记录 (次)"
-                    android:textColor="@color/white"
-                    android:textSize="@dimen/sp_14" />
+                        android:orientation="vertical" />
 
-            </LinearLayout>
+                </android.support.v7.widget.CardView>
 
             </LinearLayout>
 
         </LinearLayout>
 
-    <!-- 记录模块 -->
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0.2dp"
-        android:layout_marginTop="@dimen/dp_10"
-        android:background="@color/colorGray" />
-
+    </ScrollView>
 
-    <android.support.v7.widget.RecyclerView
-        android:id="@+id/recyclerView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content" />
 </LinearLayout>
\ No newline at end of file

plugin_member/src/main/res/layout/item_login_view.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:id="@+id/ll_login"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:gravity="center"
+    android:orientation="vertical">
+
+    <RelativeLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content">
+
+        <com.base.utils.ui.image.round.RoundImageView
+            android:id="@+id/iv_avatar"
+            android:layout_width="@dimen/size_60"
+            android:layout_height="@dimen/size_60"
+            android:layout_alignParentLeft="true"
+            android:layout_centerVertical="true"
+            android:layout_margin="@dimen/dp_10"
+            android:src="@drawable/common_icon_avatar_default" />
+
+        <TextView
+            android:id="@+id/tv_nickname"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_centerVertical="true"
+            android:layout_toRightOf="@id/iv_avatar"
+            android:ellipsize="end"
+            android:maxLength="10"
+            android:text="xxxxxx"
+            android:textColor="@color/white"
+            android:textSize="17sp" />
+
+        <ImageView
+            android:id="@+id/iv_member_level"
+            android:layout_width="@dimen/size_60"
+            android:layout_height="@dimen/size_60"
+            android:layout_alignParentRight="true"
+            android:layout_marginRight="@dimen/dp_40" />
+
+    </RelativeLayout>
+
+    <LinearLayout
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:gravity="center_vertical"
+        android:orientation="horizontal"
+        android:paddingLeft="@dimen/size_15"
+        android:paddingRight="@dimen/size_15">
+
+        <TextView
+            android:id="@+id/tv_consume_record"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentLeft="true"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:lines="2"
+            android:text="0 \n 消费记录 "
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_10" />
+
+        <View
+            android:layout_width="1px"
+            android:layout_height="match_parent"
+            android:background="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_free_day"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_centerInParent="true"
+            android:layout_weight="1"
+            android:gravity="center"
+            android:lines="2"
+            android:text="0 \n 可免费租车 (天) "
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_10" />
+
+        <View
+            android:layout_width="1px"
+            android:layout_height="match_parent"
+            android:background="@color/white" />
+
+        <TextView
+            android:id="@+id/tv_purchase_record"
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_alignParentRight="true"
+            android:layout_weight="1"
+            android:gravity="center_horizontal|bottom"
+            android:lines="2"
+            android:text="0 \n 购买记录 (次)"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_10" />
+
+    </LinearLayout>
+
+</LinearLayout>

plugin_member/src/main/res/layout/item_member_detail.xml

@@ -6,92 +6,93 @@
     android:orientation="vertical">
 
     <TextView
-        android:layout_marginLeft="@dimen/dp_10"
-        android:textStyle="bold"
         android:id="@+id/tv_member_type"
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/dp_10"
+        android:textColor="#333333"
+        android:textSize="@dimen/sp_14"
+        android:textStyle="bold" />
+
+    <LinearLayout
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:textColor="@color/black"
-        android:textSize="@dimen/size_18" />
+        android:layout_marginTop="@dimen/size_5"
+        android:orientation="horizontal"
+        android:weightSum="3">
 
         <RelativeLayout
-        android:layout_width="match_parent"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/size_20"
-        android:orientation="horizontal">
+            android:layout_weight="1">
 
             <com.rv.member.view.MemberCardView
                 android:id="@+id/mcv_discount"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/size_20"
+                android:layout_centerInParent="true"
                 app:card_type="0" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
 
             <com.rv.member.view.MemberCardView
                 android:id="@+id/mcv_free_day"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_centerInParent="true"
-            android:layout_marginLeft="@dimen/size_20"
                 app:card_type="1" />
+        </RelativeLayout>
+
+        <RelativeLayout
+            android:layout_width="0dp"
+            android:layout_height="wrap_content"
+            android:layout_weight="1">
 
             <com.rv.member.view.MemberCardView
                 android:id="@+id/mcv_free_outdoors"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:layout_marginRight="@dimen/size_20"
+                android:layout_centerInParent="true"
                 app:card_type="2" />
-
         </RelativeLayout>
 
-    <LinearLayout
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/size_15"
-        android:layout_marginTop="@dimen/size_20"
-        android:gravity="center|left"
-        android:orientation="horizontal">
-
-        <ImageView
-            android:id="@+id/img_icon"
-            android:layout_width="@dimen/size_20"
-            android:layout_height="@dimen/size_20" />
-
-        <TextView
-            android:textColor="@color/black"
-            android:id="@+id/tv_member_type_price_time"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_marginLeft="5dp" />
-
     </LinearLayout>
 
+
     <TextView
-        android:layout_marginTop="@dimen/dp_10"
         android:id="@+id/tv_describe"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/size_20"
         android:layout_marginRight="@dimen/size_20"
-        android:background="@drawable/shape_rv_bg_dark_gray"
-        android:minHeight="@dimen/size_120"
-        android:padding="@dimen/dp_10" />
+        android:textColor="#666666"
+        android:textSize="@dimen/dp_10" />
 
     <Button
         android:id="@+id/btn_buy"
         android:layout_width="match_parent"
         android:layout_height="@dimen/dp_40"
         android:layout_marginLeft="@dimen/size_20"
-        android:layout_marginTop="@dimen/size_15"
+        android:layout_marginTop="13dp"
         android:layout_marginRight="@dimen/size_20"
-        android:layout_marginBottom="@dimen/size_20"
+        android:layout_marginBottom="13dp"
         android:background="@drawable/shape_rv_bg_dark_yellow"
         android:gravity="center"
         android:textColor="@color/white"
         android:textSize="@dimen/text_16" />
 
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="1dp"
+        android:layout_marginLeft="13dp"
+        android:layout_marginRight="13dp"
+        android:background="#cccccc" />
+
+
 </LinearLayout>

plugin_member/src/main/res/layout/item_member_detail_view.xml

 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
+
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="wrap_content"
+    android:layout_height="wrap_content"
     android:paddingLeft="@dimen/size_5"
-    android:paddingRight="@dimen/size_5"
-    android:layout_weight="1">
+    android:paddingRight="@dimen/size_5">
+
 
-    <RelativeLayout
+    <LinearLayout
         android:id="@+id/rl_content"
         android:layout_width="wrap_content"
         android:layout_height="@dimen/size_150"
-        android:layout_marginTop="@dimen/size_15"
-        android:background="@drawable/shape_rv_bg_member_unselected">
+        android:background="@drawable/bg_card_normal_member"
+        android:gravity="center_horizontal"
+        android:orientation="vertical">
 
         <TextView
-            android:id="@+id/tv_price"
+            android:id="@+id/tv_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/dp_40"
-            android:gravity="center|bottom"
+            android:layout_marginTop="@dimen/size_20"
+            android:textColor="@color/white"
+            android:textSize="16sp"
             android:textStyle="bold" />
 
-        <LinearLayout
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_alignParentBottom="true"
-            android:gravity="center_horizontal"
-            android:orientation="vertical">
-
         <TextView
             android:id="@+id/tv_discount"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/dp_10"
-                android:textSize="@dimen/sp_14" />
+            android:layout_marginTop="@dimen/dp_10"
+            android:layout_marginBottom="@dimen/size_5"
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_10" />
 
         <TextView
             android:id="@+id/tv_free_day"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-                android:layout_marginBottom="@dimen/size_20"
-                android:textSize="@dimen/sp_14" />
-
-        </LinearLayout>
+            android:textColor="@color/white"
+            android:textSize="@dimen/text_10" />
 
-    </RelativeLayout>
 
         <TextView
-        android:id="@+id/tv_type_icon"
-        android:layout_width="@dimen/size_70"
-        android:layout_height="@dimen/size_30"
-        android:layout_gravity="center_horizontal"
+            android:id="@+id/tv_price"
+            android:layout_width="match_parent"
+            android:layout_height="match_parent"
             android:gravity="center"
-        android:textColor="@color/white" />
+            android:textColor="@color/white"
+            android:textStyle="bold" />
+    </LinearLayout>
 
-</FrameLayout>
+</RelativeLayout>

plugin_member/src/main/res/layout/item_member_view.xml

@@ -3,7 +3,7 @@
 
     android:layout_width="wrap_content"
     android:layout_height="wrap_content"
-    android:gravity="center_horizontal"
+    android:gravity="center"
     android:orientation="vertical">
 
     <ImageView
@@ -15,9 +15,8 @@
         android:id="@+id/tv_text"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/size_12"
         android:gravity="center"
         android:textColor="@color/black"
-        android:textSize="16sp" />
+        android:textSize="12sp" />
 
 </LinearLayout>

plugin_member/src/main/res/layout/item_unlogin_view.xml

+<?xml version="1.0" encoding="utf-8"?>
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:background="@drawable/shape_rv_bg_top_unlogin"
+    android:orientation="horizontal">
+
+    <com.base.utils.ui.image.round.RoundImageView
+        android:id="@+id/iv_avatar_default"
+        android:layout_width="@dimen/size_50"
+        android:layout_height="@dimen/size_50"
+        android:layout_alignParentLeft="true"
+        android:layout_centerVertical="true"
+        android:layout_marginLeft="13dp"
+        android:layout_marginTop="13dp"
+        android:layout_marginBottom="13dp"
+        android:src="@drawable/icon_default" />
+
+    <TextView
+        android:id="@+id/tv_login"
+        android:layout_width="@dimen/size_100"
+        android:layout_height="33.33dp"
+        android:layout_alignParentRight="true"
+        android:layout_centerVertical="true"
+        android:layout_gravity="center"
+        android:layout_marginRight="@dimen/size_15"
+        android:background="@drawable/shape_rv_bg_circle_white"
+        android:gravity="center"
+        android:text="@string/tv_login"
+        android:textColor="@color/colorYellow"
+        android:textSize="@dimen/text_14" />
+
+</RelativeLayout>
+

plugin_member/src/main/res/layout/view_member_privilege.xml

@@ -5,43 +5,40 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
-    <RelativeLayout
-        android:id="@+id/rl_member_top"
+    <LinearLayout
+        android:id="@+id/ll_member_top"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="@dimen/size_20"
-        android:visibility="gone">
+        android:orientation="horizontal"
+        android:visibility="gone"
+        android:weightSum="3">
 
         <LinearLayout
-            android:layout_width="@dimen/size_110"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentLeft="true"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:background="@drawable/shape_rv_bg_member_unselected"
+            android:layout_weight="1"
             android:gravity="center"
             android:orientation="vertical">
 
             <ImageView
                 android:id="@+id/img_discount_top"
                 android:layout_width="@dimen/size_50"
-                android:layout_height="@dimen/size_50"
-                android:layout_marginTop="13dp" />
+                android:layout_height="@dimen/size_50" />
 
             <TextView
+                android:textColor="#333333"
                 android:id="@+id/tv_discount_top"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:textSize="@dimen/text_14"
-                android:textStyle="bold" />
+                android:textSize="@dimen/text_12" />
 
             <Button
                 android:id="@+id/btn_disount_use"
-                android:layout_width="@dimen/size_80"
+                android:layout_width="73dp"
                 android:layout_height="@dimen/size_28"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/size_8"
-                android:background="@drawable/shape_rv_bg_member_top_purple"
+                android:background="@drawable/shape_member_bg_btn_yellow"
                 android:gravity="center"
                 android:text="@string/tv_use_now"
                 android:textColor="@color/white"
@@ -51,36 +48,26 @@
 
 
         <LinearLayout
-            android:layout_width="@dimen/size_110"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:layout_marginLeft="@dimen/dp_10"
-            android:background="@drawable/shape_rv_bg_member_unselected"
+            android:layout_weight="1"
             android:gravity="center"
             android:orientation="vertical">
 
-            <TextView
+            <ImageView
                 android:id="@+id/img_freeday_top"
                 android:layout_width="wrap_content"
                 android:layout_height="@dimen/size_50"
-                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" />
+                android:paddingRight="@dimen/size_5" />
 
             <TextView
+                android:textColor="#333333"
                 android:id="@+id/tv_freeday_top"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
-                android:textSize="@dimen/text_14"
-                android:textStyle="bold" />
+                android:textSize="@dimen/text_12" />
 
             <Button
                 android:id="@+id/btn_freeday_use"
@@ -88,7 +75,7 @@
                 android:layout_height="@dimen/size_28"
                 android:layout_marginTop="@dimen/dp_10"
                 android:layout_marginBottom="@dimen/size_8"
-                android:background="@drawable/shape_rv_bg_member_top_purple"
+                android:background="@drawable/shape_member_bg_btn_yellow"
                 android:gravity="center"
                 android:text="@string/tv_use_now"
                 android:textColor="@color/white"
@@ -98,11 +85,9 @@
 
 
         <LinearLayout
-            android:layout_width="@dimen/size_110"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_marginRight="@dimen/dp_10"
-            android:background="@drawable/shape_rv_bg_member_unselected"
+            android:layout_weight="1"
             android:gravity="center"
             android:orientation="vertical">
 
@@ -110,17 +95,15 @@
                 android:id="@+id/img_free_top"
                 android:layout_width="@dimen/size_50"
                 android:layout_height="@dimen/size_50"
-                android:layout_marginTop="13dp"
                 android:src="@drawable/member_icon_free" />
 
             <TextView
+                android:textColor="#333333"
                 android:id="@+id/tv_free_top"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="@dimen/dp_10"
                 android:text="@string/tv_outdoors_act"
-                android:textSize="@dimen/text_14"
-                android:textStyle="bold" />
+                android:textSize="@dimen/text_12" />
 
             <Button
                 android:layout_width="@dimen/size_80"
@@ -136,14 +119,17 @@
 
         </LinearLayout>
 
-    </RelativeLayout>
-
+    </LinearLayout>
 
-    <ImageView
-        android:layout_width="160dp"
-        android:layout_height="@dimen/size_32"
-        android:layout_marginTop="@dimen/size_15"
-        android:src="@drawable/member_image_mem_privilege_title" />
+    <View
+        android:id="@+id/view_line"
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="5dp"
+        android:layout_marginRight="@dimen/dp_10"
+        android:layout_marginBottom="@dimen/dp_10"
+        android:background="#CCCCCC" />
 
 
     <GridView
@@ -151,7 +137,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:layout_marginLeft="@dimen/size_5"
-        android:layout_marginTop="@dimen/size_20"
         android:layout_marginRight="@dimen/size_5"
         android:orientation="horizontal" />
 
@@ -176,7 +161,8 @@
             android:layout_width="match_parent"
             android:layout_height="@dimen/size_30"
             android:gravity="left|center_vertical"
-            android:text="@string/tv_agreement" />
+            android:text="@string/tv_agreement"
+            android:textSize="@dimen/text_10" />
 
     </LinearLayout>
 
@@ -184,14 +170,13 @@
     <Button
         android:id="@+id/btn_buy"
         android:layout_width="match_parent"
-        android:layout_height="@dimen/size_38"
+        android:layout_height="@dimen/dp_40"
         android:layout_marginLeft="@dimen/size_20"
         android:layout_marginTop="@dimen/size_10"
         android:layout_marginRight="@dimen/size_20"
         android:layout_marginBottom="@dimen/size_20"
-        android:background="@drawable/shape_rv_bg_dark_yellow"
         android:gravity="center"
         android:textColor="@color/white"
-        android:textSize="@dimen/text_18" />
+        android:textSize="@dimen/sp_14" />
 
 </LinearLayout>

plugin_member/src/main/res/layout/view_member_top.xml

+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    android:layout_width="match_parent"
+    android:layout_height="wrap_content"
+    android:orientation="vertical">
+
+
+    <LinearLayout
+        android:id="@+id/ll_login_content"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/dp_10"
+        android:layout_marginTop="@dimen/size_10"
+        android:layout_marginRight="@dimen/dp_10"
+        android:layout_marginBottom="13dp"
+        android:orientation="vertical">
+
+        <com.rv.member.view.UnLoginView
+            android:id="@+id/unlogin_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+
+        <com.rv.member.view.LoginView
+            android:id="@+id/logined_view"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:visibility="gone" />
+
+    </LinearLayout>
+
+    <include layout="@layout/view_member_privilege" />
+
+
+</LinearLayout>

plugin_member/src/main/res/values/strings.xml

@@ -2,8 +2,8 @@
     <string name="app_name">plugin_member</string>
 
     <string name="tv_title_member_center">会员中心</string>
-    <string name="tv_outdoors_act">户外活动</string>
-    <string name="tv_agreement">同意滴房车 《会员服务协议会员规则》 </string>
+    <string name="tv_outdoors_act">沙龙讲座活动</string>
+    <string name="tv_agreement">同意 《会员服务协议》 </string>
 
     <string name="tv_use_now">马上使用</string>