bug修复

module_home/build.gradle

@@ -41,6 +41,7 @@ dependencies {
     api project(':component_utils')
     api project(':component_control')
     api project(':plugin_search')
+    api project(':plugin_calendar')
     api project(':RvWrapper')
 //    api project(':RvTravel')
     annotationProcessor'com.alibaba:arouter-compiler:1.1.4'

module_home/src/main/AndroidManifest.xml

 <?xml version="1.0" encoding="utf-8"?>
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
     package="com.rv.home">
-
-    <application>
-        <activity android:name=".rv.module.ui.main.home.HomeFragment"></activity>
-    </application>
-
 </manifest>
\ No newline at end of file

module_home/src/main/java/com/rv/home/rv/module/ApiConfig.java

@@ -33,7 +33,7 @@ public class ApiConfig {
     public static String HTTP_URL_DRIVING_LIST = RvFrameConfig.VEHICLE_CAR_POST + "user/license/all";//驾驶证列表
     public static String HTTP_URL_DELETE_DRIVING = RvFrameConfig.VEHICLE_CAR_POST + "user/license/del";//删除驾驶员
     public static String HTTP_URL_CONFIRM_ORDER = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/add";//确认订单
-    public static String HTTP_URL_GET_ORDER_PRICE = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/app/unauth/calculate-price";//获得订单价格
+    public static String HTTP_URL_GET_ORDER_PRICE = RvFrameConfig.VEHICLE_ORDER + "orderRentVehicle/calculate-price";//获得订单价格
     public static String HTTP_URL_WEIXIN_PAY = RvFrameConfig.VEHICLE_UPLOAD + "pay/app/wx";//微信支付
     public static String HTTP_URL_ORDER_LIST = RvFrameConfig.VEHICLE_ORDER + "baseOrder/page";//订单列表
     public static String HTTP_URL_PAY_THE_CALLBACK = RvFrameConfig.VEHICLE_ORDER + "baseOrder/pay";//订单支付
@@ -64,4 +64,6 @@ public class ApiConfig {
     public static String COMMIT_ORDER_PAY = RvFrameConfig.HOST + "/api/order/baseOrder/pay";     //订单支付
 
     public static String HTTP_URL_VERSION_CHECK = "/api/app/version/app/unauth/info?version=%s"; // 检测版本
+
+    public static String HTTP_URL_FIND_BANNERLIST = RvFrameConfig.HOST + "/api/app/banner/app/unauth/findBannerlist"; // banner图接口
 }

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

@@ -55,9 +55,6 @@ public abstract class BaseStatusActivity<P extends MvpPresenter> extends SwipeBa
                 break;
         }
 
-
-
-
     }
 
 

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

@@ -4,8 +4,12 @@ import android.content.Context;
 import android.content.Intent;
 import android.os.Build;
 import android.os.Bundle;
+import android.util.Log;
 import android.widget.LinearLayout;
 
+import com.alibaba.android.arouter.facade.annotation.Autowired;
+import com.alibaba.android.arouter.facade.annotation.Route;
+import com.frame.base.url.Constance;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.ruiwenliu.wrapper.weight.webview.SafeWebView;
@@ -15,6 +19,7 @@ import com.rv.home.R2;
 
 import butterknife.BindView;
 
+@Route(path = Constance.ACTIVITY_URL_WEBVIEW)
 public class WebActivity extends BaseStatusActivity<PickerPresenter> {
 
     @BindView(R2.id.webView)
@@ -22,8 +27,11 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
     @BindView(R2.id.lay_web)
     LinearLayout mRoot;
 
+    @Autowired()
     String title;
+    @Autowired()
     String url;
+    @Autowired()
     int type;
 
     public static Intent getIntent(Context context, String title, String url) {
@@ -51,6 +59,7 @@ public class WebActivity extends BaseStatusActivity<PickerPresenter> {
             mWebView.loadUrl(url);
         } else {
             String baseUrl = url + "?type=" + type;
+            Log.i("webactivityactivyt", "initView: ----" +baseUrl);
             mWebView.loadUrl(baseUrl);
         }
     }

module_home/src/main/java/com/rv/home/rv/module/basic/presenter/CommonPresenter.java

@@ -11,7 +11,6 @@ import com.ruiwenliu.wrapper.presenter.MvpPresenter;
 
 public class CommonPresenter extends MvpPresenter {
 
-
     @Override
     /**
      * 域名地址

module_home/src/main/java/com/rv/home/rv/module/basic/presenter/PickerPresenter.java

@@ -13,6 +13,7 @@ import android.provider.MediaStore;
 import android.support.v4.content.FileProvider;
 
 
+import com.base.utils.ui.datetime.selector.util.TextUtil;
 import com.ruiwenliu.wrapper.util.FileStorage;
 
 import java.io.BufferedOutputStream;
@@ -39,6 +40,7 @@ public class PickerPresenter extends CommonPresenter {
     private File imageFile;
     private Uri cropUri;
     public FileStorage fileStore = null;
+    private Uri outputUri;
 
     /**
      * 打开系统相机获取图片
@@ -57,12 +59,12 @@ public class PickerPresenter extends CommonPresenter {
                 cropUri = FileProvider.getUriForFile(getPresenterContext(), getPresenterContext().getPackageName() +".fileProvider", imageFile);
                 intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION); //添加这一句表示对目标应用临时授权该Uri所代表的文件
             } else {//<24
-
                 cropUri = Uri.fromFile(imageFile);
             }
             intent.setAction(MediaStore.ACTION_IMAGE_CAPTURE);//设置Action为拍照
             intent.putExtra(MediaStore.EXTRA_OUTPUT, cropUri);
 //            cameraUrl = String.format("%1$s%2$s", "file://", imageFile.getPath());//相机存储地址
+
             cameraUrl = String.format("%1$s", imageFile.getPath());//相机存储地址
             ((Activity) getPresenterContext()).startActivityForResult(intent, isCrop ? TYPE_CAMERA_CROP_CODE : TYPE_CAMERA_CODE);
 
@@ -77,7 +79,10 @@ public class PickerPresenter extends CommonPresenter {
      * @return
      */
     public String gerCameraStoreUrl() {
-        return cameraUrl;
+       if (new File(cameraUrl).exists()) {
+           return cameraUrl;
+       }
+       return "";
     }
 
     /**
@@ -118,7 +123,7 @@ public class PickerPresenter extends CommonPresenter {
         if (file == null && isViewAttached() == false) { //当地址存储为空或未绑定Activity 、fragment则不执行下面操作
             return;
         }
-        Uri outputUri = Uri.fromFile(file);//缩略图保存地址
+        outputUri = Uri.fromFile(file);//缩略图保存地址
         Intent intent = new Intent("com.android.camera.action.CROP");
         if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent.addFlags(Intent.FLAG_GRANT_READ_URI_PERMISSION);

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

@@ -131,8 +131,9 @@ public class RegisteredActivity extends BaseLoginActivity<CommonPresenter> {
             etPwd.setTransformationMethod(pwdShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
         } else if (view.getId() == R.id.iv_clear_pwd) {
             confirmShow = !confirmShow;
-            ivClearAgainPwd.setSelected(confirmShow);
-            etAgainPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
+            ivClearPwd.setSelected(confirmShow);
+            etPwd.setTransformationMethod(confirmShow ? HideReturnsTransformationMethod.getInstance() : PasswordTransformationMethod.getInstance());
+
         } else if (view.getId() == R.id.iv_clear_again_pwd) {
             confirmShow = !confirmShow;
             ivClearAgainPwd.setSelected(confirmShow);

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

@@ -185,29 +185,6 @@ public class CarDetailActivity extends BaseStatusActivity<CommonPresenter> {
             startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
             finish();
         }
-
-
-//        switch (view.getId()) {
-//            case R.id.iv_back:
-//
-//                break;
-//            case R.id.iv_collect:
-//                break;
-//            case R.id.iv_share:
-//                if (shareManager != null) {
-//                    shareManager.open();
-//                }
-//                break;
-//            case R.id.tv_appointment:
-//                if (TextUtils.isEmpty(MyApplication.TYPE_USER_TOKEN)) {
-//                    RvFrameConfig.TYPE_LOGIN = 1;
-//                    startActivity(LoginRvActivity.getIntent(mActivity));
-//                    return;
-//                }
-//                startActivity(ConfirmOrderActivity.getIntent(mActivity, dataBean, mCarBean, getIntent().getStringExtra("startTime"), getIntent().getStringExtra("endTime")));
-//                finish();
-//                break;
-//        }
     }
 
     //添加收藏

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

@@ -22,11 +22,13 @@ public class HotCarTypeAdapter extends BaseQuickAdapter<HomeHotGoodListBean.Data
 
     @Override
     protected void convert(BaseGlideHolder helper, HomeHotGoodListBean.DataBean bean) {
-        helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),10);
+        helper.loadRoundImage(mContext,bean.getImgUrl(), (ImageView) helper.getView(R.id.iv_goods),6);
         helper.setText(R.id.tv_name,bean.getName());
         helper.setText(R.id.tv_content,bean.getName1());
         if (!TextUtil.isEmpty(bean.getPrice())) {
             helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", bean.getPrice(), mContext.getString(R.string.rv_day)));
+        }else {
+            helper.setText(R.id.tv_price,"");
         }
     }
 

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

@@ -18,7 +18,7 @@ public class RVEnthusiastAdapter extends BaseQuickAdapter<String, BaseGlideHolde
 
     @Override
     protected void convert(BaseGlideHolder helper, String string) {
-        helper.loadRoundImage(mContext,string,(ImageView)helper.getView(R.id.iv_activity),10);
+        helper.loadRoundImage(mContext,string,(ImageView)helper.getView(R.id.iv_activity),6);
 //        GlideManager.getInstance(mContext).loadRoundImage(string,  (ImageView)helper.getView(R.id.iv_activity),20);
 
 //        ViewGroup.LayoutParams layoutParams = helper.getView(R.id.ll_item_rv_enthusiast).getLayoutParams();

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

@@ -18,7 +18,7 @@ public class RVTourListAdapter extends BaseQuickAdapter<HomePopularBrigade.DataB
 
     @Override
     protected void convert(BaseGlideHolder helper, HomePopularBrigade.DataBean bean) {
-        helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_rv_tour),20);
+        helper.loadRoundImage(mContext,bean.getImg(), (ImageView) helper.getView(R.id.iv_rv_tour),6);
 //        GlideManager.getInstance(mContext).loadImage(bean.getImg(),  (ImageView)helper.getView(R.id.iv_rv_tour));
     }
 }

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

@@ -15,6 +15,6 @@ public class SelectedEventsAdapter extends BaseQuickAdapter<String, BaseGlideHol
 
     @Override
     protected void convert(BaseGlideHolder helper, String string) {
-        GlideManager.getInstance(mContext).loadRoundImage(string,  (ImageView)helper.getView(R.id.iv_activity),20);
+        GlideManager.getInstance(mContext).loadRoundImage(string,  (ImageView)helper.getView(R.id.iv_activity),6);
     }
 }

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

+package com.rv.home.rv.module.ui.main.home.bean;
+
+import com.ruiwenliu.wrapper.base.BaseBean;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class BeanHomeBanner extends BaseBean {
+
+    private  List<DataBean> data;
+    private int code;
+
+    public  List<DataBean> getData() {
+        return data;
+    }
+
+    public void setData( List<DataBean> data) {
+        this.data = data;
+    }
+
+    public int getCode() {
+        return code;
+    }
+
+    public void setCode(int code) {
+        this.code = code;
+    }
+
+    public static class DataBean implements Serializable {
+        private String id;//1,
+        private String title;//"首页",
+        private String cover;//"http://quanzilife.oss-cn-shenzhen.aliyuncs.com/zhrs_test/admin/hhBwsHpKHj.png",
+        private String crtName;//"admin",
+        private String crtTime;//20180822101653,
+        private String updTime;//20181229143002,
+        private String url;//"http://www.sczhrs.gov.cn/app/index/policies/policiesH5?id=5",
+        private String isDel;//0,
+        private String rank;//0
+
+
+        public String getId() {
+            return id;
+        }
+
+        public void setId(String id) {
+            this.id = id;
+        }
+
+        public String getTitle() {
+            return title;
+        }
+
+        public void setTitle(String title) {
+            this.title = title;
+        }
+
+        public String getCover() {
+            return cover;
+        }
+
+        public void setCover(String cover) {
+            this.cover = cover;
+        }
+
+        public String getCrtName() {
+            return crtName;
+        }
+
+        public void setCrtName(String crtName) {
+            this.crtName = crtName;
+        }
+
+        public String getCrtTime() {
+            return crtTime;
+        }
+
+        public void setCrtTime(String crtTime) {
+            this.crtTime = crtTime;
+        }
+
+        public String getUpdTime() {
+            return updTime;
+        }
+
+        public void setUpdTime(String updTime) {
+            this.updTime = updTime;
+        }
+
+        public String getUrl() {
+            return url;
+        }
+
+        public void setUrl(String url) {
+            this.url = url;
+        }
+
+        public String getIsDel() {
+            return isDel;
+        }
+
+        public void setIsDel(String isDel) {
+            this.isDel = isDel;
+        }
+
+        public String getRank() {
+            return rank;
+        }
+
+        public void setRank(String rank) {
+            this.rank = rank;
+        }
+
+    }
+
+}

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

@@ -161,7 +161,6 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                 private String rentDiscountPrice;//租车优惠价格
                 private int rentDiscountStatus;//租车优惠状态 0–没有优惠;1–会员折扣;2–固定值
 
-
                 public double getSum() {
                     BeanUserInfo.UserInfo info = null;
                     String spStringCode = UtilsManager.getInstance(OkGoUtil.application).getSPStringCode(SPConstance.USER_JSON, SPConstance.USER_JSON_USERINFO);
@@ -180,8 +179,8 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                         if (0 == rentDiscountStatus) {
                             amount = price;
                         } else if (1 == rentDiscountStatus) {
-                            int discount = info.getDiscount();
-                            amount = price * (discount / 100);
+                            double discount = info.getDiscount() * 0.01;
+                            amount = price * discount;
                         } else if (2 == rentDiscountStatus) {
                             if (!TextUtil.isEmpty(rentDiscountPrice)){
                                 String[] list = rentDiscountPrice.split(",");

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

@@ -9,6 +9,8 @@ import android.text.TextUtils;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
+import com.frame.base.bus.CancelOrderEvent;
+import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.ViewHolder;
@@ -49,7 +51,7 @@ public class CancelTheTripActivity extends BaseStatusActivity<PickerPresenter> {
     public void onShowResult(int requestType, BaseBean result) {
         switch (requestType) {
             case 0:
-                setResult(RESULT_OK);
+                RxBus.post(new CancelOrderEvent());
                 finish();
                 break;
         }

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

 package com.rv.home.rv.module.ui.main.home.order;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
@@ -7,8 +8,14 @@ import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.view.View;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.base.bus.CancelOrderEvent;
+import com.frame.base.bus.PaymentFailedEvent;
+import com.frame.base.bus.PaymentSuccessfulEvent;
+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.BaseFragment;
@@ -33,6 +40,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created :Auser
@@ -73,6 +82,7 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
         mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
         mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
         recyclerView.setAdapter(mAdapter);
+        initRxBus();
 
         mAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -109,6 +119,19 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
 
     }
 
+    @SuppressLint("CheckResult")
+    private void initRxBus() {
+        RxBus.tObservable(CancelOrderEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Consumer<CancelOrderEvent>() {
+                    @Override
+                    public void accept(CancelOrderEvent event) throws Exception {
+                        onRefresh();
+                    }
+                });
+
+    }
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         switch (requestType) {

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

 package com.rv.home.rv.module.ui.main.home.order;
 
+import android.annotation.SuppressLint;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -15,11 +16,15 @@ import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
+import com.frame.base.bus.CancelOrderEvent;
+import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.util.ViewHolder;
 import com.ruiwenliu.wrapper.weight.TitleView;
 import com.rv.component.dialog.PaymentTypeSelection;
+import com.rv.component.utils.ClipboardUtil;
 import com.rv.home.R;
 import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
@@ -39,6 +44,8 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
 
@@ -125,6 +132,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
+        initRxBus();
         api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
         dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
         if (dataBean !=null){
@@ -171,6 +179,19 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         }
     }
 
+    @SuppressLint("CheckResult")
+    private void initRxBus() {
+        RxBus.tObservable(CancelOrderEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Consumer<CancelOrderEvent>() {
+                    @Override
+                    public void accept(CancelOrderEvent event) throws Exception {
+                        finish();
+                    }
+                });
+
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);
@@ -400,11 +421,13 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
         }
 
         @JavascriptInterface
-        public ClipboardManager getCopy() {
-            ClipboardManager clip = (ClipboardManager) mActivity.getSystemService(Context.CLIPBOARD_SERVICE);
-            clip.setText(no);
-            showToast("复制成功！");
-            return clip;
+        public void getCopy() {
+            mWebView.post(new Runnable() {
+                @Override
+                public void run() {
+                    ClipboardUtil.setText(mActivity,no);
+                }
+            });
         }
 
         @JavascriptInterface
@@ -414,9 +437,7 @@ public class OrderDetailActivity extends BaseStatusActivity<PickerPresenter> {
 
         @JavascriptInterface
         public void showMore() {
-//            startActivity(CarDetailActivity.getIntent(mActivity, 1));
-            showToast("再看看");
+//            ARouter.getInstance().build().navigation();
         }
-
     }
 }

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

@@ -3,6 +3,7 @@ package com.rv.home.rv.module.ui.main.home.order;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.support.annotation.Nullable;
 import android.support.v4.view.ViewPager;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
@@ -140,6 +141,10 @@ public class OrderListActivity extends BaseStatusActivity<PickerPresenter> {
         return list;
     }
 
-
+    @Override
+    protected void onActivityResult(int requestCode, int resultCode, @Nullable Intent data) {
+        super.onActivityResult(requestCode, resultCode, data);
+        mAdapter.getCurrentFragment().onActivityResult(requestCode, resultCode, data);
+    }
 
 }

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

 package com.rv.home.rv.module.ui.main.home.order;
 
+import android.annotation.SuppressLint;
 import android.os.Bundle;
 import android.support.annotation.Nullable;
 import android.support.v7.widget.LinearLayoutManager;
@@ -8,6 +9,8 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.base.bus.CancelOrderEvent;
+import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
@@ -26,6 +29,8 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created :Auser
@@ -57,6 +62,7 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
 
     @Override
     protected void initView(Bundle savedInstanceState) {
+        initRxBus();
         recyclerView.setLayoutManager(new LinearLayoutManager(_mActivity));
         mAdapter = new ToTravelAdapter(new ArrayList<MultiItemEntity>());
         mAdapter.setOnLoadMoreListener(this, recyclerView);
@@ -95,6 +101,20 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
 
     }
 
+    @SuppressLint("CheckResult")
+    private void initRxBus() {
+        RxBus.tObservable(CancelOrderEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Consumer<CancelOrderEvent>() {
+                    @Override
+                    public void accept(CancelOrderEvent event) throws Exception {
+                        onRefresh();
+                    }
+                });
+
+    }
+
+
     @Override
     public void onShowResult(int requestType, BaseBean result) {
         switch (requestType) {

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

 package com.rv.home.rv.module.ui.main.home.order;
 
+import android.annotation.SuppressLint;
 import android.content.ClipboardManager;
 import android.content.Context;
 import android.content.Intent;
@@ -15,6 +16,8 @@ import android.webkit.WebViewClient;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.frame.base.bus.CancelOrderEvent;
+import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseStatusActivity;
@@ -38,6 +41,8 @@ import java.util.Map;
 import butterknife.BindView;
 import butterknife.ButterKnife;
 import butterknife.OnClick;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 
 import static com.ruiwenliu.wrapper.weight.webview.SafeWebView.hasKitkat;
 
@@ -114,6 +119,7 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
     @Override
     protected void initView(Bundle savedInstanceState, TitleView titleView, Intent intent) {
         showTitle(false);
+        initRxBus();
          api = WXAPIFactory.createWXAPI(mActivity, RvFrameConfig.APP_ID);
          dataBean = (OrderListBean.DataBeanX.DataBean) intent.getSerializableExtra("dataBean");
          if (dataBean !=null) {
@@ -174,6 +180,20 @@ public class TravelOrderDetailsActivity extends BaseStatusActivity<PickerPresent
         }
     }
 
+
+    @SuppressLint("CheckResult")
+    private void initRxBus() {
+        RxBus.tObservable(CancelOrderEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Consumer<CancelOrderEvent>() {
+                    @Override
+                    public void accept(CancelOrderEvent event) throws Exception {
+                        finish();
+                    }
+                });
+
+    }
+
     @Override
     protected void onActivityResult(int requestCode, int resultCode, Intent data) {
         super.onActivityResult(requestCode, resultCode, data);

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

@@ -23,11 +23,13 @@ import java.util.List;
 public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,BaseGlideHolder> {
     public static final int TYPE_FOR_PAYMENT=1;
     public static final int TYPE_TO_TRAVEL=2;
+    public static final int TYPE_TO_MEMBER = 3;
 
     public HaveToTravelAdapter(List<MultiItemEntity> data) {
         super(data);
         addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
         addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
+        addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
     }
 
     @Override

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

@@ -23,11 +23,13 @@ import java.util.List;
 public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity, BaseGlideHolder> {
     public static final int TYPE_FOR_PAYMENT = 1;
     public static final int TYPE_TO_TRAVEL = 2;
+    public static final int TYPE_TO_MEMBER = 3;
 
     public ToTravelAdapter(List<MultiItemEntity> data) {
         super(data);
         addItemType(TYPE_FOR_PAYMENT, R.layout.rv_item_order_for_payment);
         addItemType(TYPE_TO_TRAVEL, R.layout.rv_item_order_to_travel);
+        addItemType(TYPE_TO_MEMBER, R.layout.rv_item_order_to_member);
     }
 
     @Override
@@ -74,6 +76,8 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 helper.setText(R.id.tv_camp_process, mContext.getString(R.string.tv_boarding));
                 helper.addOnClickListener(R.id.tv_camp_process);
                 break;
+            case TYPE_TO_MEMBER:
+                break;
         }
     }
 

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

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/icon_home_item_button_left" android:state_selected="true"/>
-    <item android:drawable="@drawable/icon_home_item_button" android:state_selected="false"/>
+    <item android:drawable="@drawable/icon_home_item_button_left_bottom" android:state_selected="false"/>
 </selector>
\ No newline at end of file

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

 <?xml version="1.0" encoding="utf-8"?>
 <selector xmlns:android="http://schemas.android.com/apk/res/android">
     <item android:drawable="@drawable/icon_home_item_button_right" android:state_selected="true"/>
-    <item android:drawable="@drawable/icon_home_item_button" android:state_selected="false"/>
+    <item android:drawable="@drawable/icon_home_item_button_right_bottom" android:state_selected="false"/>
 </selector>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/icon_home_hot_selected" android:state_selected="true"/>
+    <item android:drawable="@drawable/icon_home_hot_unselected" android:state_selected="false"/>
+</selector>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="2dp"
+                android:left="2dp"
+                android:right="2dp"
+                android:top="2dp" />
+            <solid android:color="#0D171413" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#10171413" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="1dp"
+                android:left="1dp"
+                android:right="1dp"
+                android:top="1dp" />
+            <solid android:color="#12171413" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+
+    <item>
+        <shape android:shape="rectangle">
+            <padding
+                android:bottom="0.5dp"
+                android:left="0.5dp"
+                android:right="0.5dp"
+                android:top="0.5dp" />
+            <solid android:color="#17171413" />
+            <corners android:radius="8dp" />
+        </shape>
+    </item>
+    <item>
+        <shape>
+            <solid android:color="#FFFFFF" />
+            <corners android:radius="5dp" />
+        </shape>
+    </item>
+</layer-list>
\ No newline at end of file

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

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

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

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

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

@@ -410,6 +410,7 @@
                 android:padding="@dimen/size_15">
 
                 <TextView
+                    android:id="@+id/tv_deposit_hint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:drawableRight="@drawable/rv_common_icon_notice"
@@ -454,6 +455,7 @@
                         android:textSize="@dimen/text_16" />
 
                     <TextView
+                        android:id="@+id/tv_privilege_service_hint"
                         android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:layout_alignParentRight="true"
@@ -746,6 +748,7 @@
                     android:textSize="@dimen/text_16" />
 
                 <TextView
+                    android:id="@+id/tv_booking_instructions_hint"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_alignParentRight="true"

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

@@ -22,7 +22,6 @@
             android:layout_marginTop="@dimen/size_10"
             android:ellipsize="end"
             android:maxLines="1"
-            android:text="大通自行式C型房车（旅居版）"
             android:textColor="@color/textMain"
             android:textSize="@dimen/text_16" />
 
@@ -33,7 +32,6 @@
             android:layout_marginTop="@dimen/size_3"
             android:ellipsize="end"
             android:maxLines="1"
-            android:text="烧烤·麻将·微波炉"
             android:textColor="@color/textGray"
             android:textSize="@dimen/text_12" />
 

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

@@ -116,7 +116,7 @@
     <string name="rv_delete">删除</string>
     <string name="rv_driving_data_null">您还没有驾驶员哦</string>
     <string name="rv_car_type_data_null">未找到筛选数据</string>
-    <string name="rv_day_toast">租车天数必须大于1</string>
+    <string name="rv_day_toast">租车天数必须大于等于1</string>
     <string name="rv_driving_info">驾驶人信息</string>
     <string name="rv_rb">元</string>
     <string name="rv_id_card">身份证号</string>

module_home/src/main/res/values/styles.xml

@@ -67,7 +67,7 @@
 
     <!-- 给Theme设置backgroud,解决启动黑屏问题，不过这样的启动速度好像变得更慢了一些-->
     <style name="SplashTheme" parent="Theme.AppCompat.Light.NoActionBar">
-        <item name="android:windowBackground">@drawable/live_backgroud3</item>
+        <item name="android:windowBackground">@drawable/start_backgroud</item>
         <item name="windowNoTitle">true</item>
         <item name="windowActionBar">false</item>
         <item name="android:windowContentOverlay">@null</item>