会员模块单独抽出来作为一个模块

module_mine/build.gradle

@@ -40,6 +40,7 @@ dependencies {
     api project(':module_home')
     annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     implementation project(':component_dialog')
-    annotationProcessor'com.alibaba:arouter-compiler:1.1.4'
+    annotationProcessor 'com.alibaba:arouter-compiler:1.1.4'
     implementation 'top.zibin:Luban:1.1.3'
+    implementation project(':plugin_member')
 }

module_mine/src/main/AndroidManifest.xml

@@ -2,8 +2,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rv.rvmine">
 
-    <application>
-        <activity android:name=".member.MemberCenterActivity"></activity>
-    </application>
-
 </manifest>
\ No newline at end of file

module_mine/src/main/java/com/rv/rvmine/MineFragment.java

@@ -28,7 +28,7 @@ import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.rv.home.rv.module.ui.main.home.DrivingListActivity;
 import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
-import com.rv.rvmine.member.MemberCenterActivity;
+import com.rv.member.MemberCenterActivity;
 import com.rv.rvmine.bean.UserInfoBean;
 import com.rv.rvmine.personal.IDCardCertificationActivity;
 import com.rv.rvmine.rxbusevent.UserInfoEvent;

module_mine/src/main/res/drawable/shape_rv_bg_member_selected.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="5dp" />
-    <solid android:color="#F8F3C9" />
-    <stroke
-        android:width="0.2dp"
-        android:color="@color/gray_FFB74B" />
-
-</shape>
\ No newline at end of file

module_mine/src/main/res/drawable/shape_rv_bg_member_top_grap.xml

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

module_mine/src/main/res/drawable/shape_rv_bg_member_top_purple.xml

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

module_mine/src/main/res/drawable/shape_rv_bg_member_unselected.xml

-<?xml version="1.0" encoding="utf-8"?>
-<shape xmlns:android="http://schemas.android.com/apk/res/android">
-    <corners android:radius="5dp" />
-    <solid android:color="@color/white" />
-    <stroke
-        android:width="0.2dp"
-        android:color="@color/input_grap" />
-
-</shape>
\ No newline at end of file

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

@@ -40,12 +40,6 @@
 
     <string name="tv_open_membership">立即开通普通会员</string>
 
-    <string name="tv_title_member_center">会员中心</string>
-    <string name="tv_outdoors_act">户外活动</string>
-    <string name="tv_agreement">同意欣新房车 《会员服务协议会员规则》 </string>
 
-    <string name="tv_use_now">马上使用</string>
-
-    <string name="tv_please_wait">敬请期待</string>
 
 </resources>

plugin_member/.gitignore

+/build

plugin_member/build.gradle

+apply plugin: 'com.android.library'
+apply plugin: 'com.jakewharton.butterknife'
+
+android {
+    compileSdkVersion 29
+
+
+
+    defaultConfig {
+        minSdkVersion 19
+        targetSdkVersion 29
+        versionCode 1
+        versionName "1.0"
+
+        testInstrumentationRunner "android.support.test.runner.AndroidJUnitRunner"
+
+    }
+
+    buildTypes {
+        release {
+            minifyEnabled false
+            proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
+        }
+    }
+
+}
+
+dependencies {
+    implementation fileTree(include: ['*.jar'], dir: 'libs')
+    implementation 'com.jakewharton:butterknife:9.0.0-rc1'
+    annotationProcessor 'com.jakewharton:butterknife-compiler:9.0.0-rc1'
+    implementation 'com.android.support:appcompat-v7:28.0.0'
+    testImplementation 'junit:junit:4.12'
+    androidTestImplementation 'com.android.support.test:runner:1.0.2'
+    androidTestImplementation 'com.android.support.test.espresso:espresso-core:3.0.2'
+    implementation project(':component_dialog')
+    implementation project(':module_home')
+}

plugin_member/proguard-rules.pro

+# Add project specific ProGuard rules here.
+# You can control the set of applied configuration files using the
+# proguardFiles setting in build.gradle.
+#
+# For more details, see
+#   http://developer.android.com/guide/developing/tools/proguard.html
+
+# If your project uses WebView with JS, uncomment the following
+# and specify the fully qualified class name to the JavaScript interface
+# class:
+#-keepclassmembers class fqcn.of.javascript.interface.for.webview {
+#   public *;
+#}
+
+# Uncomment this to preserve the line number information for
+# debugging stack traces.
+#-keepattributes SourceFile,LineNumberTable
+
+# If you keep the line number information, uncomment this to
+# hide the original source file name.
+#-renamesourcefileattribute SourceFile

plugin_member/src/main/AndroidManifest.xml

+<manifest xmlns:android="http://schemas.android.com/apk/res/android"
+    package="com.rv.member" >
+    <application>
+        <activity android:name="com.rv.member.MemberCenterActivity"></activity>
+    </application>
+</manifest>

module_mine/src/main/java/com/rv/rvmine/member/MemberCenterActivity.java → plugin_member/src/main/java/com/rv.member/MemberCenterActivity.java

-package com.rv.rvmine.member;
+package com.rv.member;
 
 import android.annotation.SuppressLint;
+import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
@@ -28,18 +29,13 @@ import com.rv.component.dialog.PaymentTypeSelection;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
-import com.rv.rvmine.R;
-import com.rv.rvmine.R2;
-import com.rv.rvmine.member.adapter.MemberListAdapter;
-import com.rv.rvmine.member.bean.BeanTourOrderPay;
-import com.rv.rvmine.bean.MemberListBean;
-import com.rv.rvmine.member.bean.MemberOrderBean;
-import com.rv.rvmine.member.bean.MemberOrderPostBodyBean;
-import com.rv.rvmine.member.bean.PayBodyBean;
-import com.rv.rvmine.bean.UserInfoBean;
-import com.rv.rvmine.member.presenter.MemberPresenter;
-import com.rv.rvmine.personal.IDCardCertificationActivity;
-import com.tencent.mm.opensdk.modelpay.PayReq;
+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.rv.member.bean.UserInfoBean;
+import com.rv.member.presenter.MemberPresenter;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.tencent.mm.opensdk.openapi.WXAPIFactory;
 import com.yuyife.okgo.OkGoUtil;
@@ -165,7 +161,10 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
         } else if (id == R.id.tv_verified) {
             //实名认证
             if (isLogin()) return;
-            startActivityForResult(IDCardCertificationActivity.getIntent(MemberCenterActivity.this), REQUEST_VERIFIED);
+            ComponentName componentName = new ComponentName(MemberCenterActivity.this, "com.rv.rvmine.personal.IDCardCertificationActivity");
+            Intent intent = new Intent();
+            intent.setComponent(componentName);
+            startActivityForResult(intent, REQUEST_VERIFIED);
         }
     }
 

module_mine/src/main/java/com/rv/rvmine/member/adapter/GridMemerAdapter.java → plugin_member/src/main/java/com/rv.member/adapter/GridMemerAdapter.java

-package com.rv.rvmine.member.adapter;
+package com.rv.member.adapter;
 
 import android.content.Context;
 import android.graphics.Color;
@@ -13,8 +13,8 @@ import android.widget.BaseAdapter;
 import android.widget.RelativeLayout;
 import android.widget.TextView;
 
-import com.rv.rvmine.R;
-import com.rv.rvmine.bean.MemberListBean;
+import com.rv.member.R;
+import com.rv.member.bean.MemberListBean;
 
 import java.util.List;
 

module_mine/src/main/java/com/rv/rvmine/member/adapter/MemberListAdapter.java → plugin_member/src/main/java/com/rv.member/adapter/MemberListAdapter.java

-package com.rv.rvmine.member.adapter;
+package com.rv.member.adapter;
 
-import android.app.Activity;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
@@ -22,9 +21,10 @@ import android.widget.RelativeLayout;
 import android.widget.TextView;
 
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
-import com.rv.rvmine.R;
-import com.rv.rvmine.bean.MemberListBean;
-import com.rv.rvmine.member.view.MemberCardView;
+
+import com.rv.member.R;
+import com.rv.member.bean.MemberListBean;
+import com.rv.member.view.MemberCardView;
 
 import java.util.List;
 

module_mine/src/main/java/com/rv/rvmine/member/bean/BeanTourOrderPay.java → plugin_member/src/main/java/com/rv.member/bean/BeanTourOrderPay.java

-package com.rv.rvmine.member.bean;
+package com.rv.member.bean;
 
 import com.google.gson.annotations.SerializedName;
 import com.ruiwenliu.wrapper.base.BaseBean;

module_mine/src/main/java/com/rv/rvmine/bean/MemberListBean.java → plugin_member/src/main/java/com/rv.member/bean/MemberListBean.java

-package com.rv.rvmine.bean;
+package com.rv.member.bean;
 
 import com.google.gson.annotations.SerializedName;
 import com.ruiwenliu.wrapper.base.BaseBean;

module_mine/src/main/java/com/rv/rvmine/member/bean/MemberOrderBean.java → plugin_member/src/main/java/com/rv.member/bean/MemberOrderBean.java

-package com.rv.rvmine.member.bean;
+package com.rv.member.bean;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
 

module_mine/src/main/java/com/rv/rvmine/member/bean/MemberOrderPostBodyBean.java → plugin_member/src/main/java/com/rv.member/bean/MemberOrderPostBodyBean.java

-package com.rv.rvmine.member.bean;
+package com.rv.member.bean;
 
 /******
  *

module_mine/src/main/java/com/rv/rvmine/member/bean/PayBodyBean.java → plugin_member/src/main/java/com/rv.member/bean/PayBodyBean.java

-package com.rv.rvmine.member.bean;
+package com.rv.member.bean;
 
 public class PayBodyBean {
 

plugin_member/src/main/java/com/rv.member/bean/UserInfoBean.java

+package com.rv.member.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.io.Serializable;
+
+/**
+ * 获取用户信息
+ */
+public class UserInfoBean extends BaseBean {
+    private UserInfo data;
+    private boolean rel;
+
+    public UserInfo getData() {
+        return data;
+    }
+
+    public void setData(UserInfo data) {
+        this.data = data;
+    }
+
+    public boolean isRel() {
+        return rel;
+    }
+
+    public void setRel(boolean rel) {
+        this.rel = rel;
+    }
+
+    public static class UserInfo implements Serializable {
+        private Integer id;
+
+        //用户id
+        private Integer userid;
+        //imid
+        private Integer imUserid;
+        ///账号（手机号）
+        private String username;
+        //微信openid
+        private String wxOpenid;
+        //微信unionid
+        private String unionid;
+        //qq
+        private String openid;
+        //状态：0-启用，1-禁用
+        private Integer status;
+        //身份证号
+        private String idNumber;
+        //实名认证状态:0-未认证，1-已认证
+        private Integer certificationStatus;
+        //会员
+        private Integer isMember;  // 是否为会员 0-普通用户  1-会员
+        //昵称
+        private String nickname;
+        //真实姓名
+        private String realname;
+        //头像
+        private String headimgurl;
+        //邮箱
+        private String email;
+        //性别 0-女，1-男
+        private Integer sex;
+        //生日
+        private String birthday;
+        //个性签名
+        private String personSign;
+        //备注
+        private String remark;
+        // 剩余天数
+        private int  rentFreeDays ;
+        // 会员消费次数
+        private int payCount;
+        // 购买会员册数
+        private int buyCount ;
+        // 会员等级
+        private int memberLevel;
+
+        public Integer getId() {
+            return id;
+        }
+
+        public void setId(Integer id) {
+            this.id = id;
+        }
+
+        public Integer getUserid() {
+            return userid;
+        }
+
+        public void setUserid(Integer userid) {
+            this.userid = userid;
+        }
+
+        public Integer getImUserid() {
+            return imUserid;
+        }
+
+        public void setImUserid(Integer imUserid) {
+            this.imUserid = imUserid;
+        }
+
+        public String getUsername() {
+            return username;
+        }
+
+        public void setUsername(String username) {
+            this.username = username;
+        }
+
+        public String getWxOpenid() {
+            return wxOpenid;
+        }
+
+        public void setWxOpenid(String wxOpenid) {
+            this.wxOpenid = wxOpenid;
+        }
+
+        public String getUnionid() {
+            return unionid;
+        }
+
+        public void setUnionid(String unionid) {
+            this.unionid = unionid;
+        }
+
+        public String getOpenid() {
+            return openid;
+        }
+
+        public void setOpenid(String openid) {
+            this.openid = openid;
+        }
+
+        public Integer getStatus() {
+            return status;
+        }
+
+        public void setStatus(Integer status) {
+            this.status = status;
+        }
+
+        public String getIdNumber() {
+            return idNumber;
+        }
+
+        public void setIdNumber(String idNumber) {
+            this.idNumber = idNumber;
+        }
+
+        public Integer getCertificationStatus() {
+            return certificationStatus;
+        }
+
+        public void setCertificationStatus(Integer certificationStatus) {
+            this.certificationStatus = certificationStatus;
+        }
+
+        public Integer getIsMember() {
+            return isMember;
+        }
+
+        public void setIsMember(Integer isMember) {
+            this.isMember = isMember;
+        }
+
+        public String getNickname() {
+            return nickname;
+        }
+
+        public void setNickname(String nickname) {
+            this.nickname = nickname;
+        }
+
+        public String getRealname() {
+            return realname;
+        }
+
+        public void setRealname(String realname) {
+            this.realname = realname;
+        }
+
+        public String getHeadimgurl() {
+            return headimgurl;
+        }
+
+        public void setHeadimgurl(String headimgurl) {
+            this.headimgurl = headimgurl;
+        }
+
+        public String getEmail() {
+            return email;
+        }
+
+        public void setEmail(String email) {
+            this.email = email;
+        }
+
+        public Integer getSex() {
+            return sex;
+        }
+
+        public void setSex(Integer sex) {
+            this.sex = sex;
+        }
+
+        public String getBirthday() {
+            return birthday;
+        }
+
+        public void setBirthday(String birthday) {
+            this.birthday = birthday;
+        }
+
+        public String getPersonSign() {
+            return personSign;
+        }
+
+        public void setPersonSign(String personSign) {
+            this.personSign = personSign;
+        }
+
+        public String getRemark() {
+            return remark;
+        }
+
+        public void setRemark(String remark) {
+            this.remark = remark;
+        }
+
+        public int getRentFreeDays() {
+            return rentFreeDays;
+        }
+
+        public void setRentFreeDays(int rentFreeDays) {
+            this.rentFreeDays = rentFreeDays;
+        }
+
+        public int getPayCount() {
+            return payCount;
+        }
+
+        public void setPayCount(int payCount) {
+            this.payCount = payCount;
+        }
+
+        public int getBuyCount() {
+            return buyCount;
+        }
+
+        public void setBuyCount(int buyCount) {
+            this.buyCount = buyCount;
+        }
+
+        public int getMemberLevel() {
+            return memberLevel;
+        }
+
+        public void setMemberLevel(int memberLevel) {
+            this.memberLevel = memberLevel;
+        }
+    }
+}

module_mine/src/main/java/com/rv/rvmine/member/presenter/MemberPresenter.java → plugin_member/src/main/java/com/rv.member/presenter/MemberPresenter.java

-package com.rv.rvmine.member.presenter;
+package com.rv.member.presenter;
 
-import android.app.Activity;
 import android.content.Context;
 import android.widget.Toast;
 
@@ -8,11 +7,11 @@ import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.weight.ToastView;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
-import com.rv.rvmine.bean.MemberListBean;
-import com.rv.rvmine.member.bean.BeanTourOrderPay;
-import com.rv.rvmine.member.bean.MemberOrderBean;
-import com.rv.rvmine.member.bean.MemberOrderPostBodyBean;
-import com.rv.rvmine.member.bean.PayBodyBean;
+import com.rv.member.bean.MemberListBean;
+import com.rv.member.bean.BeanTourOrderPay;
+import com.rv.member.bean.MemberOrderBean;
+import com.rv.member.bean.MemberOrderPostBodyBean;
+import com.rv.member.bean.PayBodyBean;
 import com.tencent.mm.opensdk.modelpay.PayReq;
 import com.tencent.mm.opensdk.openapi.IWXAPI;
 import com.yuyife.okgo.OkGoUtil;

module_mine/src/main/java/com/rv/rvmine/member/view/MemberCardView.java → plugin_member/src/main/java/com/rv.member/view/MemberCardView.java

-package com.rv.rvmine.member.view;
+package com.rv.member.view;
 
 import android.content.Context;
 import android.content.res.TypedArray;
@@ -9,7 +9,8 @@ import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
-import com.rv.rvmine.R;
+import com.rv.member.R;
+
 
 public class MemberCardView extends LinearLayout {