bug修复

MyFrame/src/main/java/com/frame/base/bus/IDCardCertificationEvent.java

+package com.frame.base.bus;
+
+public class IDCardCertificationEvent {
+}

MyFrame/src/main/java/com/frame/base/bus/LoginUserInfoEvent.java

+package com.frame.base.bus;
+
+public class LoginUserInfoEvent extends Event {
+}

MyFrame/src/main/java/com/frame/base/bus/RxBus.java

@@ -62,10 +62,11 @@ public class RxBus {
      * @return
      */
     public static <T> Observable<T> tObservable(final Class<T> eventType){
-        return  getInstance().mBus.ofType(eventType).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread());
+        return  getInstance().mBus.ofType(eventType).subscribeOn(Schedulers.newThread()).observeOn(AndroidSchedulers.mainThread()).unsubscribeOn(Schedulers.newThread());
     }
 
 
+
     /**
      * 根据传递的 eventType 类型返回特定类型（eventType) 的被观察者
      * @param eventType

RvClient/build.gradle

@@ -7,8 +7,8 @@ android {
         applicationId "com.xxfc.rv"
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
-        versionCode 105
-        versionName "1.0.5"
+        versionCode 106
+        versionName "1.0.6"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

module_home/src/main/java/com/rv/home/rv/module/basic/bean/BeanUserInfo.java → RvWrapper/src/main/java/com/ruiwenliu/wrapper/bean/BeanUserInfo.java

-package com.rv.home.rv.module.basic.bean;
+package com.ruiwenliu.wrapper.bean;
 
 import com.ruiwenliu.wrapper.base.BaseBean;
 

module_home/src/main/java/com/rv/home/rv/module/basic/BaseLoginActivity.java

@@ -8,18 +8,17 @@ import android.support.annotation.Nullable;
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
 import com.frame.base.bus.LoginSuccessfulEvent;
+import com.frame.base.bus.LoginUserInfoEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
-import com.frame.rv.OnModuleEventListener;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.SPConstance;
-import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.rv.home.rv.module.ui.main.home.CarDetailActivity;
 import com.umeng.socialize.UMAuthListener;
@@ -87,6 +86,7 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
 
     public void setDataUser(BeanUserInfo data) {
         UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERINFO, JSON.toJSONString(data.getData())).commit();
+        RxBus.post(new LoginUserInfoEvent());
     }
 
     /**
@@ -133,21 +133,21 @@ public abstract class BaseLoginActivity<P extends MvpPresenter> extends BaseStat
             mPresenter.getDataHead(RvFrameConfig.ADMIN_POST, 10, ApiConfig.HTTP_URL_APP_USER_INFO, BeanUserInfo.class, headMap, false);
         }
         OkGoUtil.setToken(registeredBean.getToken());
-            switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
-                case 1:
-                    if ("0".equals(bean.getData().getCertificationStatus())) {   //实名认证状态:0-未认证，1-已认证
-                        ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
-                    } else {
-                        startActivity(CarDetailActivity.getIntent(mActivity, 1));
-                    }
-                    break;
-                default:
-                    finish();
-                    break;
-            }
+//        switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN) {
+//            case 1:
+//                if ("0".equals(bean.getData().getCertificationStatus())) {   //实名认证状态:0-未认证，1-已认证
+//                    ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
+//                } else {
+//                    startActivity(CarDetailActivity.getIntent(mActivity, 1));
+//                }
+//                break;
+//            default:
+//                finish();
+//                break;
+//        }
 
         RxBus.post(new LoginSuccessfulEvent());
         finish();
     }
 
-    }
+}

module_home/src/main/java/com/rv/home/rv/module/basic/BaseStatusActivity.java

@@ -17,7 +17,7 @@ import com.ruiwenliu.wrapper.inter.OnViewHolder;
 import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 import com.ruiwenliu.wrapper.util.UtilsManager;
 import com.ruiwenliu.wrapper.util.ViewHolder;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.ui.login.LoginRvActivity;
 import com.yuyife.okgo.OkGoUtil;
 
@@ -149,13 +149,4 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
         });
     }
 
-    protected  BeanUserInfo.UserInfo getUserInfo(){
-        BeanUserInfo.UserInfo userInfo = null;
-        String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
-        if (!TextUtil.isEmpty(spStringCode)) {
-           userInfo = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
-        }
-        return userInfo;
-    }
-
 }

module_home/src/main/java/com/rv/home/rv/module/ui/login/BingPhoneActivity.java

@@ -18,7 +18,7 @@ import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.bean.CheckLoginBean;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;

module_home/src/main/java/com/rv/home/rv/module/ui/login/ConfirmPwdActivity.java

@@ -17,7 +17,7 @@ import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.listener.TextChangedListener;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.umeng.socialize.bean.SHARE_MEDIA;

module_home/src/main/java/com/rv/home/rv/module/ui/login/LoginRvActivity.java

@@ -13,7 +13,6 @@ import android.widget.TextView;
 
 import com.alibaba.android.arouter.facade.annotation.Route;
 import com.frame.base.bus.LoginSuccessfulEvent;
-import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -26,7 +25,7 @@ import com.rv.home.R2;
 import com.frame.rv.config.RvFrameConfig;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
@@ -148,51 +147,6 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         } else if (view.getId() == R.id.iv_clear_code) {
             clearEditData(etPhoneCode);
         }
-
-
-//        switch (view.getId()) {
-//            case R2.id.tv_get_code:
-//
-//                break;
-//            case R.id.tv_login:
-////                if (TextUtils.isEmpty(getPhone())) {
-////                    showToast(mActivity.getString(R.string.rv_phone_hint));
-////                    return;
-////                }
-////                if (TextUtils.isEmpty(getPhone())) {
-////                    showToast(mActivity.getString(R.string.rv_phone_code));
-////                    return;
-////                }
-//                codeLogin();
-//                break;
-//            case R.id.iv_weixin:
-//                umLogin(SHARE_MEDIA.WEIXIN);
-//                break;
-//            case R.id.iv_qq:
-//                umLogin(SHARE_MEDIA.QQ);
-//                break;
-//            case R.id.tv_pwd_login:
-////                UMShareAPI.get(mActivity).deleteOauth(mActivity, SHARE_MEDIA.WEIXIN, new LoginOutListener(this){
-////                    @Override
-////                    public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
-////                        super.onComplete(share_media, i, map);
-////                        Toast.makeText(mActivity, "退出微信登录成功！", Toast.LENGTH_SHORT).show();
-////                    }
-////                });
-//                startActivity(PwdLoginActivity.getIntent(mActivity));
-//                break;
-//            case R.id.tv_registered:
-//                startActivity(RegisteredActivity.getIntent(mActivity, 0));
-//                break;
-//            case R.id.iv_clear_phone:
-//                clearEditData(etPhone);
-//                break;
-//            case R.id.iv_clear_code:
-//                clearEditData(etPhoneCode);
-//                break;
-//
-//
-//        }
     }
 
     @Override
@@ -201,6 +155,12 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
         stopCarousel();
     }
 
+    @Override
+    protected void onStop() {
+        super.onStop();
+        stopCarousel();
+    }
+
     /**
      * 第三方登陆，未注册走该方法
      *
@@ -287,23 +247,13 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
                 } else if (editText.getId() == R.id.et_phone_code) {
                     ivClearCode.setVisibility(getCode().length() > 0 ? View.VISIBLE : View.GONE);
                 }
-//                switch (editText.getId()) {
-//                    case R.id.et_phone:
-//                        ivClearPhone.setVisibility(getPhone().length() > 0 ? View.VISIBLE : View.GONE);
-//                        break;
-//                    case R.id.et_phone_code:
-//                        ivClearCode.setVisibility(getCode().length() > 0 ? View.VISIBLE : View.GONE);
-//                        break;
-//                }
-                if (etPhone.length() > 0 && etPhoneCode.length() > 0) {
+                if (getPhone().length() > 0 && getCode().length() > 0) {
                     tvLogin.setEnabled(true);
                     tvLogin.setSelected(true);
                 } else {
                     tvLogin.setEnabled(false);
                     tvLogin.setSelected(false);
                 }
-
-
             }
         });
     }
@@ -318,7 +268,6 @@ public class LoginRvActivity extends BaseLoginActivity<CommonPresenter> {
             @Override
             public void accept(Disposable disposable) throws Exception {
                 tvGetCode.setEnabled(false);
-
             }
         }, new Observer<Long>() {
             @Override

module_home/src/main/java/com/rv/home/rv/module/ui/login/PwdLoginActivity.java

@@ -18,7 +18,7 @@ import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.umeng.socialize.bean.SHARE_MEDIA;

module_home/src/main/java/com/rv/home/rv/module/ui/login/RegisteredActivity.java

@@ -24,12 +24,11 @@ import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseLoginActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.login.bean.RegisteredBean;
 import com.rv.home.rv.module.ui.login.bean.SendCodeBean;
 import com.umeng.socialize.bean.SHARE_MEDIA;
-import com.yuyife.okgo.OkGoUtil;
 
 import java.util.LinkedHashMap;
 import java.util.Map;

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarDetailActivity.java

@@ -17,17 +17,21 @@ import android.widget.ImageView;
 import android.widget.TextView;
 
 import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.bus.IDCardCertificationEvent;
+import com.frame.base.bus.Observer;
+import com.frame.base.bus.RxBus;
 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.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
-import com.rv.home.rv.module.basic.BaseStatusActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 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.bean.CarTypeListBean;
@@ -40,6 +44,7 @@ import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
 
@@ -90,7 +95,19 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         tvTitleCenter.setText("车辆详情");
         webUrl = ApiConfig.HTTP_URL_CAR_TYPE_DETAIL + "?id=" + mCarBean.getVehicleModel().getId() + "&companyId=" + mCarBean.getCompany().getId();
         initWeb();
-        initShare(webUrl, mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
+        initRxbus();
+        initShare(webUrl +"&shareType=app", mCarBean.getVehicleModel().getName(), mCarBean.getCompany().getAddrDetail(), mCarBean.getVehicleModel().getIcon());
+    }
+
+    private void initRxbus() {
+        RxBus.tObservable(IDCardCertificationEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<IDCardCertificationEvent>(disposable) {
+                    @Override
+                    public void onNext(IDCardCertificationEvent event) {
+                        startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
+                    }
+                });
     }
 
     @Override
@@ -173,8 +190,7 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
         }else if(view.getId()==R.id.iv_collect){
            //添加收藏
             addCollection();
-        }
-        else if(view.getId()==R.id.iv_share){
+        } else if(view.getId()==R.id.iv_share){
             if (shareManager != null) {
                 shareManager.open();
             }
@@ -187,12 +203,11 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             BeanUserInfo.UserInfo userInfo = getUserInfo();
             if (userInfo !=null){
                 if (userInfo.getCertificationStatus() ==0){
-                    showToast("亲，你还没有实名认证！");
+                    ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
                     return;
                 }
             }
             startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
-            finish();
         }
     }
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/CarRentalListActivity.java

@@ -80,6 +80,7 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
     private OrderDataBean dataBean;
     private String begDate;
     private String endDate;
+    private long copyDay;//租车天数
 
     public static Intent getIntent(Context context, double lat, double lon, double outLatitude, double outLongitude, boolean bool, OrderDataBean bean, String startTime, String endTime) {
         return new Intent(context, CarRentalListActivity.class)
@@ -405,8 +406,10 @@ public class CarRentalListActivity extends BaseStatusActivity<CommonPresenter> i
         if (resultCode == 200 && requestCode == 109) {
             begDate = data.getStringExtra("begDate");
             endDate = data.getStringExtra("endDate");
+            copyDay =  DateUtils.compareDateDay(endDate, begDate) + 1;
             tvGetDate.setText("取" + DateUtils.formatDate66(begDate));
             tvOutDate.setText("还" + DateUtils.formatDate66(endDate));
+            dataBean.setDayNum(Integer.valueOf(copyDay + ""));
             try {
                 dataBean.setStartTime(TimeManager.dateToStamp(begDate));
                 dataBean.setEndTime(TimeManager.dateToStamp(endDate));

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/ConfirmOrderActivity.java

@@ -15,14 +15,13 @@ import android.widget.CheckBox;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.PopupWindow;
-import android.widget.RatingBar;
 import android.widget.TextView;
-import android.widget.Toast;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.alibaba.fastjson.JSON;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.frame.base.bus.LoginSuccessfulEvent;
+import com.frame.base.bus.LoginUserInfoEvent;
 import com.frame.base.bus.Observer;
 import com.frame.base.bus.PaymentFailedEvent;
 import com.frame.base.bus.PaymentSuccessfulEvent;
@@ -43,7 +42,7 @@ import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.BaseStatusActivity;
 import com.rv.home.rv.module.basic.WebActivity;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.bean.CarTypeListBean;
 import com.rv.home.rv.module.ui.main.home.bean.ConfirmOrderBean;
@@ -66,6 +65,7 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+
 import io.reactivex.schedulers.Schedulers;
 
 /**
@@ -201,6 +201,25 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                         }
                     }
                 });
+
+        RxBus.tObservable(LoginUserInfoEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<LoginUserInfoEvent>(disposable) {
+                    @Override
+                    public void onNext(LoginUserInfoEvent event) {
+                        tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
+                        if (info != null) {
+                            if (0 == info.getIsMember()) {
+                                tvLayoutMemberHint.setVisibility(View.GONE);
+                                llLayoutMemberHint.setVisibility(View.GONE);
+                            } else if (1 == info.getIsMember()) {
+                                tvLayoutMemberHint.setVisibility(View.VISIBLE);
+                                llLayoutMemberHint.setVisibility(View.VISIBLE);
+                                tvFreeCarDays.setText("（剩余" + info.getRentFreeDays() + "天）");
+                            }
+                        }
+                    }
+                });
     }
 
     @Override
@@ -261,12 +280,11 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                     break;
             }
         }
-
     }
 
     @OnClick({R2.id.rl_goods, R2.id.tv_get_car_address, R2.id.tv_out_car_address, R2.id.iv_add_driving,
-            R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving,R2.id.ll_item_xin_driving,
-            R2.id.rb_user_driving,R2.id.tv_user_driving_hint, R2.id.tv_contract_agreement, R2.id.tv_service_fee_show, R2.id.tv_vehicle_cleaning_fee_show,
+            R2.id.tv_detail, R2.id.tv_confirm_order, R2.id.tv_delete, R2.id.rb_xin_driving, R2.id.ll_item_xin_driving,
+            R2.id.rb_user_driving, R2.id.tv_user_driving_hint, R2.id.tv_contract_agreement, R2.id.tv_service_fee_show, R2.id.tv_vehicle_cleaning_fee_show,
             R2.id.tv_lab3, R2.id.tv_deposit_hint, R2.id.tv_privilege_service_hint, R2.id.tv_booking_instructions_hint})
     public void onViewClicked(View view) {
         int id = view.getId();
@@ -444,7 +462,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
         GlideManager.getInstance(mActivity).loadImage(mCarBean.getVehicleModel().getIcon(), ivGoods);
         tvName.setText(mCarBean.getVehicleModel().getName());
         tvContent.setText(mCarBean.getVehicleModel().getKeyword());
-        ratingBar.setStarMark((float) mCarBean.getVehicleModel().getScore() /10);
+        ratingBar.setStarMark((float) mCarBean.getVehicleModel().getScore() / 10);
         tvPrice.setText(String.format("%1$s%2$s", mCarBean.getVehicleModel().getSum(), mActivity.getString(R.string.rv_day)));
         tvEventDate.setText(getIntent().getStringExtra("startTime") + "~" + getIntent().getStringExtra("endTime"));
         tvActivityDay.setText(String.format("%1$s%2$s", dataBean.getDayNum(), mActivity.getString(R.string.rv_days)));
@@ -594,10 +612,7 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
                     getWindow().setAttributes(lp);
                 }
             });
-
-
         }
-
     }
 
     @SuppressWarnings("ResourceType")

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingListActivity.java

@@ -43,8 +43,6 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
                 .putExtra("data", dataBean);
     }
 
-    ;
-
     @Override
     protected int setLayout() {
         return R.layout.rv_act_driving_list;
@@ -80,6 +78,10 @@ public class DrivingListActivity extends BaseStatusActivity<CommonPresenter> imp
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
                 if (view.getId() == R.id.tv_edit) {
                     startActivityForResult(DrivingUploadActivity.getIntent(mActivity, mAdapter.getItem(position)), TYPE_REQUEST_ADD);
+                }else if (view.getId() == R.id.cb_driving){
+                    getIntent().putExtra("bean", mAdapter.getItem(position));
+                    setResult(RESULT_OK, getIntent());
+                    finish();
                 }
             }
         });

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/DrivingUploadActivity.java

@@ -40,6 +40,8 @@ import io.reactivex.functions.Consumer;
 import okhttp3.MediaType;
 import okhttp3.MultipartBody;
 import okhttp3.RequestBody;
+import top.zibin.luban.Luban;
+import top.zibin.luban.OnCompressListener;
 
 public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
 
@@ -264,10 +266,20 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
     /**
      * 上传文件
      *
-     * @param file
+     * @param files
      */
-    private void uploadFile(File file, String fileName) {
+    private void uploadFile(File files, final String fileName) {
 
+        Luban.with(this)
+                .load(files)                                   // 传人要压缩的图片列表
+                .ignoreBy(100)                                  // 忽略不压缩图片的大小
+                .setCompressListener(new OnCompressListener() { //设置回调
+                    @Override
+                    public void onStart() {
+                    }
+
+                    @Override
+                    public void onSuccess(File file) {
                         RequestBody requestFile =
                                 RequestBody.create(MediaType.parse("application/otcet-stream"), file);
                         MultipartBody.Part body =
@@ -284,6 +296,17 @@ public class DrivingUploadActivity extends BaseStatusActivity<PickerPresenter> {
                         mPresenter.getUploadFile(RvFrameConfig.VEHICLE_UPLOAD, 0, ApiConfig.HTTP_URL_FILE_UPLOAD, ImageUploadBean.class, description, body, true);
                     }
 
+                    @Override
+                    public void onError(Throwable e) {
+
+                    }
+                }).launch();    //启动压缩
+
+
+
+
+    }
+
 
     /**
      * 编辑或修改驾驶证信息

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/adapter/DrivingListAdapter.java

@@ -37,12 +37,12 @@ public class DrivingListAdapter extends BaseQuickAdapter<DrivingListBean.DataBea
             helper.setChecked(R.id.cb_driving, false);
         }
         helper.addOnClickListener(R.id.tv_edit);
+        helper.addOnClickListener(R.id.cb_driving);
         helper.setOnCheckedChangeListener(R.id.cb_driving, new CompoundButton.OnCheckedChangeListener() {
             @Override
             public void onCheckedChanged(CompoundButton buttonView, boolean isChecked) {
-              int position =getPosition(item);
-              setItemState(isChecked, position);
-
+//              int position =getPosition(item);
+//              setItemState(isChecked, position);
             }
         });
     }

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/bean/CarTypeListBean.java

@@ -2,17 +2,13 @@ package com.rv.home.rv.module.ui.main.home.bean;
 
 import com.alibaba.fastjson.JSON;
 import com.base.utils.ui.datetime.selector.util.TextUtil;
-import com.google.gson.Gson;
 import com.google.gson.annotations.SerializedName;
-import com.google.gson.reflect.TypeToken;
 import com.ruiwenliu.wrapper.SPConstance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.UtilsManager;
-import com.rv.home.rv.module.basic.bean.BeanUserInfo;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.yuyife.okgo.OkGoUtil;
 
-import org.w3c.dom.Text;
-
 import java.io.Serializable;
 import java.util.List;
 

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/ForPaymentFragment.java

@@ -3,9 +3,13 @@ package com.rv.home.rv.module.ui.main.home.order;
 import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
+import android.os.Handler;
+import android.os.Looper;
+import android.os.Message;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.util.Log;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -43,6 +47,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.Observable;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
@@ -64,6 +70,10 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
     private IWXAPI api;
     private long effTime = 0; // 失效时间
 
+    private OrderListBean.DataBeanX.DataBean payBean = null;
+    private int payPosition = -1;
+    private OrderListActivity.SwitchListener mListener;
+
     public static ForPaymentFragment getInstance(int type) {
         Bundle bundl = new Bundle();
         bundl.putInt("type", type);
@@ -72,6 +82,12 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
         return fragment;
     }
 
+    public static ForPaymentFragment getInstance(int type, OrderListActivity.SwitchListener listener) {
+        ForPaymentFragment fragment = getInstance(type);
+        fragment.mListener = listener;
+        return fragment;
+    }
+
     @Override
     public int getViewLayout() {
         return R.layout.common_refresh;
@@ -102,19 +118,15 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
             }
         });
 
+
         mAdapter.setOnItemChildClickListener(new BaseQuickAdapter.OnItemChildClickListener() {
             @Override
             public void onItemChildClick(BaseQuickAdapter adapter, View view, int position) {
+                payPosition = position;
                 int id = view.getId();
-                if (id == R.id.tv_process) {
-                    OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                    payShowSelect(dataBean.getNo(), dataBean.getOrderAmount());
-                } else if (id == R.id.tv_camp_process) {
-                    OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                    payShowSelect(dataBean.getNo(), dataBean.getOrderAmount());
-                } else if (id == R.id.tv_member_pay) {
-                    OrderListBean.DataBeanX.DataBean dataBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
-                    payShowSelect(dataBean.getNo(), dataBean.getOrderAmount());
+                if (id == R.id.tv_process || id == R.id.tv_camp_process || id == R.id.tv_member_pay) {
+                    payBean = (OrderListBean.DataBeanX.DataBean) adapter.getItem(position);
+                    payShowSelect(payBean.getNo(), payBean.getOrderAmount());
                 }
             }
         });
@@ -125,23 +137,43 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
         getEffectiveTime();
     }
 
+    private Handler handler = new Handler(Looper.getMainLooper()) {
+        @Override
+        public void handleMessage(Message msg) {
+            super.handleMessage(msg);
+            if (payPosition != -1) {
+                if (mAdapter != null && !mAdapter.getData().isEmpty()) {
+                    mAdapter.getData().remove(payPosition);
+                    mAdapter.notifyDataSetChanged();
+                }
+            }
+            if (mListener != null) {
+                mListener.switchTab(3);
+            }
+        }
+    };
+    private Disposable disposable;
+
     @SuppressLint("CheckResult")
     private void initRxBus() {
 
-        RxBus.tObservable(CancelOrderEvent.class)
-                .observeOn(Schedulers.newThread())
-                .subscribe(new Observer<CancelOrderEvent>(disposable) {
+        disposable = RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(Schedulers.io())
+                .subscribe(new Consumer<PaymentSuccessfulEvent>() {
                     @Override
-                    public void onNext(CancelOrderEvent event) {
-                        onRefresh();
+                    public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
+                        handler.sendEmptyMessage(0);
                     }
                 });
-
     }
 
     @Override
     public void onDestroyView() {
         super.onDestroyView();
+        handler.removeCallbacksAndMessages(null);
+        if (disposable != null && !disposable.isDisposed()) {
+            disposable.dispose();
+        }
     }
 
     @Override
@@ -184,7 +216,6 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
     public void onRefresh() {
         mPage = 1;
         orderData(mPage);
-
     }
 
     @Override

module_home/src/main/java/com/rv/home/rv/module/ui/main/home/order/OrderListActivity.java

@@ -40,15 +40,18 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
 
     private OrderMenuAdapter menuAdapter;
     private TabAdapter mAdapter;
-    public final static int TYPE_FOR_PAYMENT=0;//待付款
-    public final static int TYPE_TO_TRAVEL=1;//待出行
-    public final static int TYPE_HAVE_TO_TRAVEL=2;//已出行
-    public final static int TYPE_COMPLETED=3;//已完成
-    public final static int TYPE_ALL_ORDER=4;//全部
+    public final static int TYPE_FOR_PAYMENT = 0;//待付款
+    public final static int TYPE_TO_TRAVEL = 1;//待出行
+    public final static int TYPE_HAVE_TO_TRAVEL = 2;//已出行
+    public final static int TYPE_COMPLETED = 3;//已完成
+    public final static int TYPE_ALL_ORDER = 4;//全部
     private int menuPosition;
-    public static Intent getIntent(Context context,int position) {
-        return new Intent(context, OrderListActivity.class).putExtra("position",position);
-    };
+
+    public static Intent getIntent(Context context, int position) {
+        return new Intent(context, OrderListActivity.class).putExtra("position", position);
+    }
+
+    ;
 
 
     @Override
@@ -58,7 +61,7 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
 
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
-        menuPosition=intent.getIntExtra("position",0);
+        menuPosition = intent.getIntExtra("position", 0);
         titleView.setTitle(mActivity.getString(R.string.rv_my_order));
         initRecyclerView();
         initViewpager();
@@ -76,18 +79,17 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
     }
 
 
-
     /**
      * 初始化RecyclerView
      */
-    private void initRecyclerView(){
+    private void initRecyclerView() {
         recyclerView.setLayoutManager(new GridLayoutManager(mActivity, 5));
-        menuAdapter=new OrderMenuAdapter();
-        recyclerView.setAdapter(menuAdapter );
+        menuAdapter = new OrderMenuAdapter();
+        recyclerView.setAdapter(menuAdapter);
         recyclerView.addItemDecoration(new SpaceItemDecoration(5));
         GallerySnapHelper snapHelper = new GallerySnapHelper();
         snapHelper.attachToRecyclerView(recyclerView);
-        List<String> list=new ArrayList<>();
+        List<String> list = new ArrayList<>();
         list.add(mActivity.getString(R.string.rv_order_for_payment));
         list.add(mActivity.getString(R.string.rv_order_to_travel));
         list.add(mActivity.getString(R.string.rv_order_have_travel));
@@ -106,8 +108,8 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
     /**
      * 初始化Viewpager
      */
-    private void initViewpager(){
-        mAdapter=new TabAdapter(getSupportFragmentManager(),getListFragment());
+    private void initViewpager() {
+        mAdapter = new TabAdapter(getSupportFragmentManager(), getListFragment());
         mViewPager.setAdapter(mAdapter);
         mViewPager.addOnPageChangeListener(new ViewPager.OnPageChangeListener() {
             @Override
@@ -133,7 +135,7 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
 
     private List<BaseFragment> getListFragment() {
         List<BaseFragment> list = new ArrayList<>();
-        list.add(ForPaymentFragment.getInstance(TYPE_FOR_PAYMENT));
+        list.add(ForPaymentFragment.getInstance(TYPE_FOR_PAYMENT, switchListener));
         list.add(ToTravelFragment.getInstance(TYPE_TO_TRAVEL));
         list.add(HaveToTravelFragment.getInstance(TYPE_HAVE_TO_TRAVEL));
         list.add(CompletedFragment.getInstance(TYPE_COMPLETED));
@@ -147,4 +149,20 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
         mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
     }
 
+    public SwitchListener switchListener = new SwitchListener() {
+        @Override
+        public void switchTab(int position) {
+            if (menuAdapter != null && mViewPager != null) {
+                menuAdapter.setSelectItem(position);
+                mViewPager.setCurrentItem(position);
+            }
+        }
+    };
+
+    /******
+     * 切换事件
+     */
+    public interface SwitchListener {
+        void switchTab(int position);
+    }
 }

module_home/src/main/res/layout/rv_act_driving_upload.xml

@@ -25,10 +25,10 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-
-            android:orientation="horizontal"
-            android:padding="@dimen/size_15">
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginRight="@dimen/size_15"
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -39,8 +39,8 @@
 
             <EditText
                 android:id="@+id/et_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@null"
                 android:hint="@string/rv_name_hint"
                 android:maxLength="10"
@@ -62,10 +62,11 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginRight="@dimen/size_15"
             android:background="@color/colorWrite"
-            android:orientation="horizontal"
-            android:padding="@dimen/size_15">
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -76,8 +77,8 @@
 
             <EditText
                 android:id="@+id/et_phone"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@null"
                 android:hint="@string/rv_phone_hint"
                 android:inputType="number"
@@ -100,10 +101,11 @@
 
         <LinearLayout
             android:layout_width="match_parent"
-            android:layout_height="wrap_content"
+            android:layout_height="@dimen/size_50"
+            android:layout_marginLeft="@dimen/size_15"
+            android:layout_marginRight="@dimen/size_15"
             android:background="@color/colorWrite"
-            android:orientation="horizontal"
-            android:padding="@dimen/size_15">
+            android:orientation="horizontal">
 
             <TextView
                 android:layout_width="wrap_content"
@@ -114,8 +116,8 @@
 
             <EditText
                 android:id="@+id/et_id_card"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@null"
                 android:digits="0123456789xyzXYZ"
                 android:hint="@string/rv_id_card_hint"

module_home/src/main/res/layout/rv_act_login.xml

@@ -64,6 +64,7 @@
         android:background="@drawable/shape_rv_input"
         android:gravity="center_vertical"
         android:orientation="horizontal">
+
         <EditText
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
@@ -84,13 +85,14 @@
             android:id="@+id/iv_clear_code"
             android:padding="@dimen/size_15"
             android:visibility="gone"
-            android:src="@drawable/comment_publisher_clear"
-            />
+            android:src="@drawable/comment_publisher_clear" />
+
         <View
             android:layout_width="@dimen/size_half"
             android:layout_height="@dimen/size_30"
             android:layout_marginRight="@dimen/size_8"
             android:background="@color/colorMain" />
+
         <TextView
             android:layout_width="@dimen/size_100"
             android:layout_height="match_parent"

module_home/src/main/res/layout/rv_item_driving_list.xml

@@ -7,6 +7,7 @@
     android:paddingTop="@dimen/size_15"
     android:paddingRight="@dimen/size_15"
     android:layout_height="wrap_content">
+
     <LinearLayout
         android:id="@+id/ll_driving"
         android:orientation="horizontal"
@@ -17,7 +18,6 @@
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:id="@+id/cb_driving"
-            android:enabled="false"
             android:layout_gravity="center_vertical"
             />
         <TextView

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

@@ -59,7 +59,6 @@ import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
 import butterknife.Unbinder;
-import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
 /**
@@ -107,9 +106,12 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
     Banner mineBanner;
     @BindView(R2.id.refresh)
     SimpleRefreshLayout mSimpleRefreshLayout;
+    @BindView(R2.id.tv_user_identity)
+    TextView tvUserIdentity;
 
     Unbinder unbinder;
 
+
     private UserInfoBean.UserInfo info;
 
     public static MineFragment getInstance(int type) {
@@ -271,6 +273,7 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
             ivMember.setVisibility(View.GONE);
             tvLogin.setVisibility(View.VISIBLE);
             tvVerified.setVisibility(View.GONE);
+            tvUserIdentity.setVisibility(View.GONE);
             tvViewPrivileges.setText("会员中心");
             tvMembershipLevel.setText("会员特权");
             tvMemberHint.setText("免费用车7天");
@@ -386,6 +389,14 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
 //                    tvVerified.setEnabled(false);
                 }
 
+                if (TextUtils.isEmpty(info.getPositionName())){
+                     tvUserIdentity.setVisibility(View.GONE);
+                }else {
+                    tvUserIdentity.setText(info.getPositionName());
+                    tvUserIdentity.setVisibility(View.VISIBLE);
+
+                }
+
                 if (0 == info.getIsMember()) {
                     tvMembershipLevel.setText("会员特权");
                     tvMemberHint.setText("免费用车7天");

module_mine/src/main/java/com/rv/rvmine/bean/UserInfoBean.java

@@ -76,7 +76,9 @@ public class UserInfoBean extends BaseBean {
         // 会员等级
         private int memberLevel;
 
-        private int discount;
+        private int discount;  //会员折扣
+
+        private String positionName;//  职位名称
 
         public Integer getId() {
             return id;
@@ -269,5 +271,13 @@ public class UserInfoBean extends BaseBean {
         public void setDiscount(int discount) {
             this.discount = discount;
         }
+
+        public String getPositionName() {
+            return positionName;
+        }
+
+        public void setPositionName(String positionName) {
+            this.positionName = positionName;
+        }
     }
 }

module_mine/src/main/java/com/rv/rvmine/personal/IDCardCertificationActivity.java

@@ -125,7 +125,6 @@ public class IDCardCertificationActivity extends BaseStatusActivity<PickerPresen
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        // TODO: add setContentView(...) invocation
         ButterKnife.bind(this);
     }
 

module_mine/src/main/java/com/rv/rvmine/personal/SuccessfulCertificationActivity.java

@@ -3,18 +3,22 @@ package com.rv.rvmine.personal;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.view.View;
 
-import com.alibaba.android.arouter.facade.annotation.Route;
-import com.alibaba.android.arouter.launcher.ARouter;
-import com.frame.base.url.Constance;
-import com.frame.rv.config.RvFrameConfig;
-import com.rv.home.rv.module.ui.main.home.CarDetailActivity;
+import com.alibaba.fastjson.JSON;
+import com.base.utils.ui.datetime.selector.util.TextUtil;
+import com.frame.base.bus.IDCardCertificationEvent;
+import com.frame.base.bus.RxBus;
+import com.ruiwenliu.wrapper.SPConstance;
+import com.ruiwenliu.wrapper.util.UtilsManager;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.rv.rvmine.R2;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.home.rv.module.basic.presenter.PickerPresenter;
 import com.rv.rvmine.R;
+import com.yuyife.okgo.OkGoUtil;
 
 import butterknife.ButterKnife;
 import butterknife.OnClick;
@@ -23,7 +27,7 @@ import butterknife.OnClick;
  * 实名认证成功
  */
 public class SuccessfulCertificationActivity extends BaseStatusActivity<PickerPresenter> {
-
+    BeanUserInfo.UserInfo userInfo = null;
 
     public static Intent getIntent(Context context) {
         return new Intent(context, SuccessfulCertificationActivity.class);
@@ -37,6 +41,10 @@ public class SuccessfulCertificationActivity extends BaseStatusActivity<PickerPr
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         titleView.setTitle("身份证认证");
+        String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
+        if (!TextUtil.isEmpty(spStringCode)) {
+            userInfo = JSON.parseObject(spStringCode, BeanUserInfo.UserInfo.class);
+        }
     }
 
     @Override
@@ -51,15 +59,15 @@ public class SuccessfulCertificationActivity extends BaseStatusActivity<PickerPr
     }
 
     @OnClick(R2.id.tv_ok)
-    public void onViewClicked() {
-        switch (RvFrameConfig.RvFrameInfo.TYPE_LOGIN){
-            case 1:
-                 startActivity(CarDetailActivity.getIntent(mActivity, 1));
-                break;
-            default:
-                finish();
-                break;
+    public void onViewClicked(View view) {
+        int id = view.getId();
+        if (id == R.id.tv_ok){
+            if (userInfo !=null){
+                userInfo.setCertificationStatus(1);
+                UtilsManager.getInstance(OkGoUtil.application).setSharePreferencesSave(SPConstance.USER_JSON).putString(SPConstance.USER_JSON_USERINFO, JSON.toJSONString(userInfo)).commit();
             }
+            RxBus.post(new IDCardCertificationEvent());
             finish();
         }
+    }
 }

module_mine/src/main/res/layout/activity_add_avisitor.xml

@@ -76,8 +76,8 @@
 
             <EditText
                 android:id="@+id/et_traveler_name"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="match_parent"
+                android:layout_height="match_parent"
                 android:background="@null"
                 android:hint="@string/et_traveler_name_hint"
                 android:maxLength="10"
@@ -191,7 +191,7 @@
                 android:digits="0123456789xyzXYZ"
                 android:id="@+id/et_id_card"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@null"
                 android:hint="@string/et_id_card_hint"
@@ -226,7 +226,7 @@
             <EditText
                 android:id="@+id/et_phone"
                 android:layout_width="0dp"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
                 android:layout_weight="1"
                 android:background="@null"
                 android:hint="@string/et_phone_hint"

module_mine/src/main/res/layout/activity_mine.xml

@@ -5,10 +5,9 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout
-        xmlns:android="http://schemas.android.com/apk/res/android"
-        android:layout_width="match_parent"
+    <com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout xmlns:android="http://schemas.android.com/apk/res/android"
         android:id="@+id/refresh"
+        android:layout_width="match_parent"
         android:layout_height="match_parent">
 
         <ScrollView
@@ -56,14 +55,36 @@
                                 android:gravity="center_vertical"
                                 android:orientation="vertical">
 
+                                <LinearLayout
+                                    android:layout_width="match_parent"
+                                    android:layout_height="wrap_content"
+                                    android:orientation="horizontal">
+
                                     <TextView
                                         android:id="@+id/tv_nickname"
                                         android:layout_width="wrap_content"
                                         android:layout_height="wrap_content"
+                                        android:text="333333"
                                         android:textColor="@color/colorYellow"
                                         android:textSize="@dimen/text_16"
                                         android:visibility="gone" />
 
+                                    <TextView
+                                        android:id="@+id/tv_user_identity"
+                                        android:layout_width="wrap_content"
+                                        android:layout_height="wrap_content"
+                                        android:layout_marginLeft="@dimen/size_5"
+                                        android:background="@drawable/common_icon_user_type"
+                                        android:maxLines="1"
+                                        android:paddingLeft="@dimen/size_3"
+                                        android:paddingTop="@dimen/size_1"
+                                        android:paddingRight="@dimen/size_3"
+                                        android:paddingBottom="@dimen/size_1"
+                                        android:text="股东"
+                                        android:textColor="@color/colorGray"
+                                        android:textSize="@dimen/text_10"
+                                        android:visibility="gone" />
+                                </LinearLayout>
 
                                 <ImageView
                                     android:id="@+id/iv_member"
@@ -83,7 +104,8 @@
                                     android:gravity="center"
                                     android:text="@string/tv_login"
                                     android:textColor="@color/colorYellow"
-                                    android:textSize="@dimen/text_14" />
+                                    android:textSize="@dimen/text_14"
+                                    android:visibility="visible" />
                             </LinearLayout>
 
                             <TextView

module_tourism/src/main/java/com/rv/tourism/other/TravelDetailsActivity.java

@@ -26,6 +26,7 @@ import com.google.gson.Gson;
 import com.google.gson.reflect.TypeToken;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
+import com.ruiwenliu.wrapper.bean.BeanUserInfo;
 import com.ruiwenliu.wrapper.util.um.CustomShareListener;
 import com.ruiwenliu.wrapper.util.um.ShareManager;
 import com.ruiwenliu.wrapper.weight.TitleView;
@@ -107,7 +108,7 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
         tvTitleCenter.setText("旅游详情");
         webUrl = "https://xxtest.upyuns.com/h5/appHtml/view/travelDetails.html?id=" + id;
         initWeb();
-        initShare(webUrl, name, content, url);
+        initShare(webUrl+"&shareType=app", name, content, url);
         mWebView.loadUrl("JavaScript:getTourStock()"); // Android调用h5
     }
 
@@ -140,9 +141,16 @@ public class TravelDetailsActivity extends BaseStatusActivity<TourismPresenter>
             //预订
             if (TextUtils.isEmpty(OkGoUtil.getToken())) {
                 ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
-//                startActivity(LoginRvActivity.getIntent(mActivity));
                 return;
             }
+            BeanUserInfo.UserInfo userInfo = getUserInfo();
+            if (userInfo !=null){
+                if (userInfo.getCertificationStatus() ==0){
+                    ARouter.getInstance().build(Constance.ACTIVITY_URL_IDCARDCERTIFICATION).navigation();
+                    return;
+                }
+            }
+
             mWebView.loadUrl("JavaScript:openModal()"); // Android调用h5
             llItemBottom.setVisibility(View.GONE);
         }

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

@@ -47,6 +47,7 @@ import java.util.Map;
 
 import butterknife.BindView;
 import butterknife.OnClick;
+import io.reactivex.disposables.Disposable;
 import io.reactivex.functions.Consumer;
 import io.reactivex.schedulers.Schedulers;
 
@@ -104,9 +105,13 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
         initRxBus();
     }
 
+    private Disposable disposableSuc;
+    private Disposable disposableFail;
+
+
     @SuppressLint("CheckResult")
     private void initRxBus() {
-        RxBus.tObservable(PaymentSuccessfulEvent.class)
+        disposableSuc = RxBus.tObservable(PaymentSuccessfulEvent.class)
                 .observeOn(Schedulers.io())
                 .subscribe(new Consumer<PaymentSuccessfulEvent>() {
                     @Override
@@ -115,18 +120,31 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
                     }
                 });
 
-        RxBus.tObservable(PaymentFailedEvent.class)
+        disposableFail = RxBus.tObservable(PaymentFailedEvent.class)
                 .observeOn(Schedulers.newThread())
                 .subscribe(new Consumer<PaymentFailedEvent>() {
                     @Override
                     public void accept(PaymentFailedEvent payEvent) throws Exception {
                         if (mActivity.getClass().equals(MemberCenterActivity.class)) {
-                            Log.e("xxxxxxxxxxxxxx", "xxxxxxxxxxxxxxxxxxxxxxxxxx");
                             ARouter.getInstance().build(Constance.ACTIVITY_URL_ORDERLIST).navigation();
                             finish();
                         }
                     }
                 });
+        Log.e("xxxxxxxxxxxxxx", disposableSuc == disposableFail ? "true" : "false");
+    }
+
+    @Override
+    public void onDestroy() {
+        super.onDestroy();
+
+        if (disposableSuc != null && !disposableSuc.isDisposed()) {
+            disposableSuc.dispose();
+        }
+
+        if (disposableFail != null && !disposableFail.isDisposed()) {
+            disposableFail.dispose();
+        }
     }
 
     @Override