修改新人专享，推广有礼的样式

RvClient/src/main/res/drawable/start_back_icon.xml

@@ -2,11 +2,15 @@
 <layer-list xmlns:android="http://schemas.android.com/apk/res/android">
     <item>
         <shape>
-            <solid android:color="@color/colorWrite"/>
+            <solid android:color="@color/colorWrite" />
         </shape>
     </item>
-    <item>
-        <bitmap android:src="@drawable/start_backgroud2"
-            android:gravity="center"/>
+    <item
+        android:bottom="@dimen/size_50">
+
+        <bitmap
+            android:gravity="bottom"
+            android:src="@drawable/bottom_backgroud2"
+            />
     </item>
 </layer-list>
\ No newline at end of file

RvClient/src/main/res/layout/rv_act_weclome.xml

@@ -7,9 +7,9 @@
     tools:context=".WakeUpActivity">
 
     <ImageView
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
+        android:layout_width="match_parent"
+        android:layout_height="match_parent"
         android:layout_gravity="center"
         android:scaleType="centerCrop"
-        android:src="@drawable/start_backgroud2"/>
+        android:src="@drawable/start_backgroud" />
 </FrameLayout>

module_discovery/src/main/java/com/xxfc/discovery/utils/TransformationUtils.java → RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/TransformationUtil.java

-package com.xxfc.discovery.utils;
+package com.ruiwenliu.wrapper.util;
 
 import android.graphics.Bitmap;
 import android.view.ViewGroup;
@@ -6,13 +6,11 @@ import android.widget.ImageView;
 
 import com.bumptech.glide.request.target.ImageViewTarget;
 
-public class TransformationUtils extends ImageViewTarget<Bitmap> {
+public class TransformationUtil extends ImageViewTarget<Bitmap> {
 
     private ImageView target;
 
-
-
-    public TransformationUtils(ImageView target) {
+    public TransformationUtil(ImageView target) {
         super(target);
         this.target = target;
     }

module_discovery/src/main/java/com/xxfc/discovery/adapter/DiscoveryRecommendAdapter.java

@@ -14,12 +14,12 @@ import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.BaseViewHolder;
+import com.ruiwenliu.wrapper.util.TransformationUtil;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
 import com.ruiwenliu.wrapper.util.glide.GlideOptions;
 import com.ruiwenliu.wrapper.util.glide.GlideRoundTransform;
 import com.xxfc.discovery.R;
 import com.xxfc.discovery.bean.DiscoveryRecommendBean;
-import com.xxfc.discovery.utils.TransformationUtils;
 import com.xxfc.imcamera.photopicker.Image;
 
 /**
@@ -62,7 +62,7 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
                 ImageView image = helper.getView(R.id.iv_icon_pat);
                 GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
                         error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
-                TransformationUtils utils = new TransformationUtils(image);
+                TransformationUtil utils = new TransformationUtil(image);
                 Glide.with(mContext)
                         .asBitmap()
                         .load(body.getImages().get(0).getOurl())

module_discovery/src/main/java/com/xxfc/discovery/api/DiscoveryApi.java

@@ -3,7 +3,9 @@ package com.xxfc.discovery.api;
 import com.frame.rv.config.RvFrameConfig;
 
 public interface DiscoveryApi extends RvFrameConfig {
-    String IMA_BASEUSRL = "https://imapi.dfangche.com";
+//    String IMA_BASEUSRL = "https://imapi.dfangche.com";
+    String IMA_BASEUSRL = "https://xxfcim.upyuns.com/xxfcim";
+
     //问题列表
     String DISCOVERY_IMQUESTION_LIST = HOST + "/api/im/imQuestion/list";
 

module_discovery/src/main/java/com/xxfc/discovery/fragment/PatFragment.java

@@ -101,6 +101,7 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
                     ARouter.getInstance()
                             .build(Constance.ACTIVITY_URL_DETAILPAT)
                             .withString("id", item.getMsgId())
+                            .withString("isPraise",item.getIsPraise())
                             .navigation();
                 }
             }

module_discovery/src/main/java/com/xxfc/discovery/other/DetailPatActivity.java

@@ -70,6 +70,11 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
     @Autowired()
     String id;
 
+    @Autowired()
+    String isPraise;
+
+    private boolean praises;
+
     @Override
     protected int setLayout() {
         return R.layout.activity_detail_pat;
@@ -185,6 +190,28 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
             case 1:
                 mWebView.reload();
                 break;
+            case 2:
+                DiscoveryIMTokenBean intokenBean2 = (DiscoveryIMTokenBean) result;
+                setIMData(intokenBean2);
+                break;
+            case 3:
+            case 4:
+                mWebView.reload();
+                break;
+        }
+    }
+
+    private void setIMData(DiscoveryIMTokenBean bean) {
+        if (praises) {//0：未点赞 1：已点赞
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("access_token", bean.getData());
+            map.put("messageId", id);
+            mPresenter.postData(3, DiscoveryApi.DISCOVERY_PRAISE_ADD, BaseBean.class, map, false);
+        } else {
+            Map<String, Object> map = new LinkedHashMap<>();
+            map.put("access_token", bean.getData());
+            map.put("messageId", id);
+            mPresenter.postData(4, DiscoveryApi.DISCOVERY_PRAISE_DELETE, BaseBean.class, map, false);
         }
     }
 
@@ -218,8 +245,16 @@ public class DetailPatActivity extends BaseStatusActivity<DiscoveryPresenter> {
 
 
         @JavascriptInterface
-        public void isLike() {
-            showToast("点点");
+        public void isLike(boolean praise) {
+             praises  = praise;
+
+            if (OkGoUtil.getToken() != null) {
+                Map<String, Object> headMap = new LinkedHashMap<>();
+                headMap.put("Authorization", OkGoUtil.getToken());
+                mPresenter.postData(RvFrameConfig.HOST, 2, DiscoveryApi.DISCOVERY_IM_LOGIN, DiscoveryIMTokenBean.class, headMap, headMap, false);
+            } else {
+                ARouter.getInstance().build(Constance.ACTIVITY_URL_LOGINRV).navigation();
+            }
         }
     }
 

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

@@ -122,4 +122,7 @@ public class ApiConfig {
 
     //押金退还进度
     public static String HTTP_URL_WEBVIEW_REFUNDPROGRESS = RvFrameConfig.HOST_H5_DETAIL + "/h5/appHtml/view/depositProgress.html";
+
+    //获取推荐消息列表
+    public static  String RVENTHUSIAST_HOTMSG_LIST = RvFrameConfig.HOST + "/api/im/msg/app/unauth/hotMsg/list";
 }

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

@@ -624,7 +624,14 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
      * 初始化View
      */
     private void intiView() {
-        GlideManager.getInstance(mActivity).loadImage(mCarBean.getVehicleModel().getIcon(), ivGoods);
+        String icon ="";
+        if (!TextUtils.isEmpty(mCarBean.getVehicleModel().getCoverPic())){
+            icon = mCarBean.getVehicleModel().getCoverPic();
+        }else {
+            icon = mCarBean.getVehicleModel().getIcon();
+        }
+        GlideManager.getInstance(mActivity).loadImage(icon, ivGoods);
+
         tvName.setText(mCarBean.getVehicleModel().getName());
         tvContent.setText(mCarBean.getVehicleModel().getKeyword());
         ratingBar.setStarMark((float) mCarBean.getVehicleModel().getScore() / 10);

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

@@ -14,6 +14,7 @@ import android.support.annotation.Nullable;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.LinearLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.support.v7.widget.StaggeredGridLayoutManager;
 import android.text.TextUtils;
 import android.util.Log;
 import android.view.LayoutInflater;
@@ -67,6 +68,7 @@ import com.rv.home.rv.module.ui.main.home.bean.BeanHomeBanner;
 import com.rv.home.rv.module.ui.main.home.bean.CityPickerBean;
 import com.rv.home.rv.module.ui.main.home.bean.HomeHotGoodListBean;
 import com.rv.home.rv.module.ui.main.home.bean.HomePopularBrigade;
+import com.rv.home.rv.module.ui.main.home.bean.HomeRecommendBean;
 import com.rv.home.rv.module.ui.main.home.bean.ListsBean;
 import com.rv.home.rv.module.ui.main.home.bean.OrderDataBean;
 import com.rv.home.rv.module.ui.main.home.bean.SelectedActivitiesBean;
@@ -127,8 +129,8 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
     RecyclerView recyclerViewRvtourlist;
     @BindView(R2.id.recyclerView_rvtourlist_title)
     RecyclerView recyclerViewRvtourlistTitle;
-    //    @BindView(R2.id.recyclerView_rv_enthusiast)
-//    RecyclerView recyclerViewRvEnthusiast;
+    @BindView(R2.id.recyclerView_rv_enthusiast)
+    RecyclerView recyclerViewRvEnthusiast;
     @BindView(R2.id.travel_city_text)
     TextView travelCityText;
     @BindView(R2.id.travel_city_layout)
@@ -234,12 +236,15 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
 
     private HotCarTypeAdapter mAdapter;
     private SelectedEventsAdapter mActivityAdapter;
-//            private RVEnthusiastAdapter mRvEnthusiast;
+    private RVEnthusiastAdapter mRvEnthusiast;
     private RVTourListAdapter mRvTourAdapter;
     private RVTourListLabelAdapter mRvTourLabelAdapter;
 
     private int height;
 
+    private int countPage;
+    private int mPage;
+
     public static HomeFragment getInstance(int type) {
         Bundle bundl = new Bundle();
         bundl.putInt("type", type);
@@ -313,12 +318,36 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         });
 
         //房车发烧友
-//        mRvEnthusiast = new RVEnthusiastAdapter();
-//        recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
-//      recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
-//        recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
-//        recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
-//        recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
+        mRvEnthusiast = new RVEnthusiastAdapter();
+        final StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
+
+        recyclerViewRvEnthusiast.setItemAnimator(null);
+        recyclerViewRvEnthusiast.addOnScrollListener(new RecyclerView.OnScrollListener() {
+            @Override
+            public void onScrollStateChanged(RecyclerView recyclerView, int newState) {
+                super.onScrollStateChanged(recyclerView, newState);
+                int[] first = new int[2];
+                staggeredGridLayoutManager.findFirstCompletelyVisibleItemPositions(first);
+                if (newState == RecyclerView.SCROLL_STATE_IDLE && (first[0] == 1 || first[1] == 1)) {
+                    recyclerView.invalidateItemDecorations();
+                }
+            }
+        });
+
+        recyclerViewRvEnthusiast.setLayoutManager(staggeredGridLayoutManager);
+        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(20));// 分割线。
+        recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
+        mRvEnthusiast.bindToRecyclerView(recyclerViewRvEnthusiast);
+        mRvEnthusiast.setEnableLoadMore(true);
+        mRvEnthusiast.disableLoadMoreIfNotFullPage();
+
+
+
+        recyclerViewRvEnthusiast.setLayoutManager(new GridLayoutManager(getContext(), 2));
+        recyclerViewRvEnthusiast.addItemDecoration(new AbSpacesItemDecoration(10));// 分割线。
+        recyclerViewRvEnthusiast.addItemDecoration(new flow(10));
+        recyclerViewRvEnthusiast.setNestedScrollingEnabled(false);
+        recyclerViewRvEnthusiast.setAdapter(mRvEnthusiast);
 
         //房车游榜单
         mRvTourAdapter = new RVTourListAdapter();
@@ -393,24 +422,12 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         });
     }
 
-    @Override
-    public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
-        // TODO: inflate a fragment view
-        View rootView = super.onCreateView(inflater, container, savedInstanceState);
-        unbinder3 = ButterKnife.bind(this, rootView);
-        return rootView;
-    }
-
-    @Override
-    public void onDestroyView() {
-        super.onDestroyView();
-        unbinder3.unbind();
-    }
 
     @Override
     public void onRefresh() {
         hotData();
         recommendGood("2");
+        onFreshLoadDisCovery();
     }
 
 
@@ -433,6 +450,32 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         }
     }
 
+    public class AbSpacesItemDecoration2 extends RecyclerView.ItemDecoration {
+
+        private int left;
+        private int right;
+
+        public AbSpacesItemDecoration2(int left, int right) {
+            this.left = left;
+            this.right = right;
+        }
+
+        @Override
+        public void getItemOffsets(Rect outRect, View view, RecyclerView parent, RecyclerView.State state) {
+            int position = parent.getChildAdapterPosition(view);
+            StaggeredGridLayoutManager.LayoutParams lp = (StaggeredGridLayoutManager.LayoutParams) view.getLayoutParams();
+
+            if (lp.getSpanIndex() % 2 == 0) {
+                outRect.left = left;
+                outRect.right = right;
+            } else {
+                outRect.left = right;
+                outRect.right = left;
+            }
+            outRect.top = left;
+        }
+    }
+
     public class flow extends RecyclerView.ItemDecoration {
 
         private int space;
@@ -471,6 +514,24 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         loadBannerData();
         hotData();
         recommendGood("2");
+        onFreshLoadDisCovery();
+    }
+
+    /**
+     * 刷新
+     */
+    private void onFreshLoadDisCovery() {
+        mPage = 1;
+        loadDisCovery(mPage);
+    }
+
+    /**
+     * 房车发烧友
+     */
+    private void loadDisCovery(int page) {
+        Map<String, Object> map = new LinkedHashMap<>();
+        map.put("page", page);
+        mPresenter.postData( 5, ApiConfig.RVENTHUSIAST_HOTMSG_LIST, HomeRecommendBean.class, map, false);
     }
 
     /**
@@ -526,10 +587,27 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                     mActivityAdapter.setNewData(bean.getData());
                 }
                 break;
+            case 5:
+                setRecommend((HomeRecommendBean) result);
+                break;
         }
 
     }
 
+    private void setRecommend(HomeRecommendBean bean) {
+        if (mPage == 1) {
+            countPage = bean.getData().getTotalPage();
+            mRvEnthusiast.setNewData(bean.getData().getList());
+            if (bean.getData().getTotalCount() == 0) {
+//                mRvEnthusiast.setEmptyView(getEmptyView(rvContent, -1, "暂无推荐数据"));
+                mRvEnthusiast.notifyDataSetChanged();
+            }
+        } else {
+            mRvEnthusiast.addData(bean.getData().getList());
+            mRvEnthusiast.loadMoreComplete();
+        }
+    }
+
     private void setRecommendGood(HomeHotGoodListBean data) {
         mAdapter.getData().clear();
         mAdapter.setType(hotType);
@@ -1003,6 +1081,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
                 headTvOutShop.setTextColor(_mActivity.getResources().getColor(R.color.colorMain));
                 outLatitude = bean.getData().getData().get(0).getLatitude();
                 outLongitude = bean.getData().getData().get(0).getLongitude();
+                outCompanyId = bean.getData().getData().get(0).getId();
             }
         } else {
             getCompanyName = "";
@@ -1081,6 +1160,7 @@ public class HomeFragment extends BaseFragment<HomePresenter> implements Observa
         dataBean.setStartTime(DateUtils.StringToTimeMillis2(getTime));
         dataBean.setEndTime(DateUtils.StringToTimeMillis2(outTime));
         dataBean.setEndCityName(endCity);
+        dataBean.setEndCompanyId(outCompanyId);
         dataBean.setEndAddr(endAddress);
         dataBean.setDriverType(2);
         dataBean.setStartCompanyId(getCompanyId);

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

 package com.rv.home.rv.module.ui.main.home.adapter;
 
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 
@@ -30,7 +31,15 @@ public class CarRentalListAdapter extends BaseQuickAdapter<CarTypeListBean.DataB
             helper.setText(R.id.tv_name, item.getVehicleModel().getName());
             helper.setText(R.id.tv_context, item.getVehicleModel().getKeyword());
             helper.setText(R.id.tv_point, String.valueOf(item.getVehicleModel().getPoint()));
-            helper.loadRoundImage(mContext, item.getVehicleModel().getIcon(), (ImageView) helper.getView(R.id.iv_goods), 10, DisplayUtil.dip2px(mContext,  helper.getView(R.id.iv_goods).getWidth()), DisplayUtil.dip2px(mContext, helper.getView(R.id.iv_goods).getHeight()));
+
+            String icon ="";
+            if (!TextUtils.isEmpty(item.getVehicleModel().getCoverPic())){
+                icon = item.getVehicleModel().getCoverPic();
+            }else {
+                icon = item.getVehicleModel().getIcon();
+            }
+
+            helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 10, DisplayUtil.dip2px(mContext,  helper.getView(R.id.iv_goods).getWidth()), DisplayUtil.dip2px(mContext, helper.getView(R.id.iv_goods).getHeight()));
 //        helper.setText(R.id.tv_name,item);
             helper.setText(R.id.tv_price, String.format("¥%1$s%2$s", item.getVehicleModel().getPrice(), mContext.getString(R.string.rv_day)));
             float score = (float) item.getVehicleModel().getScore() / 10;

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

 package com.rv.home.rv.module.ui.main.home.adapter;
 
-import android.view.ViewGroup;
 import android.widget.ImageView;
-
+import com.bumptech.glide.Glide;
+import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
+import com.bumptech.glide.request.RequestOptions;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.ruiwenliu.wrapper.util.BaseGlideHolder;
+import com.ruiwenliu.wrapper.util.TransformationUtil;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.glide.GlideOptions;
 import com.rv.home.R;
+import com.rv.home.rv.module.ui.main.home.bean.HomeRecommendBean;
 
-import java.util.Random;
-
-public class RVEnthusiastAdapter extends BaseQuickAdapter<String, BaseGlideHolder> {
+public class RVEnthusiastAdapter extends BaseQuickAdapter<HomeRecommendBean.DataBeanX.DataBean, BaseGlideHolder> {
 
     public RVEnthusiastAdapter() {
         super(R.layout.rv_item_rv_enthusiast);
     }
 
     @Override
-    protected void convert(BaseGlideHolder helper, String string) {
-        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);
+    protected void convert(BaseGlideHolder helper, HomeRecommendBean.DataBeanX.DataBean item) {
+        HomeRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
+        if (body != null) {
+            if (body.getImages() != null && body.getImages().size() > 0) {
+
+//                GlideManager.getInstance(mContext).loadRoundImage2(body.getImages().get(0).getOurl(), (ImageView) helper.getView(R.id.iv_icon_pat),8);
+
+                ImageView image = helper.getView(R.id.iv_icon_pat);
+                GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
+                        error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
+                TransformationUtil utils = new TransformationUtil(image);
+                Glide.with(mContext)
+                        .asBitmap()
+                        .load(body.getImages().get(0).getOurl())
+                        .apply(options)
+                        .apply(RequestOptions.bitmapTransform(new RoundedCorners(12)).override(image.getWidth(), image.getHeight()))
+                        .into(utils);
+            }
+
+            helper.setText(R.id.tv_title, body.getText());
+            if ("4".equals(body.getType())) { //消息类型 基础属性 1=文字消息、2=图文消息、3=语音消息、4=视频消息、 5=文件消
+                helper.setGone(R.id.iv_isvideo, true);
+            } else {
+                helper.setGone(R.id.iv_isvideo, false);
+            }
+        }
+        helper.setText(R.id.tv_user_name, item.getNickname());
+        GlideManager.getInstance(mContext).loadImage(item.getPicUrl(), (ImageView) helper.getView(R.id.iv_user_icon));
+        if (item.getCount() != null) {
+            helper.setText(R.id.iv_like_number, item.getCount().getPraise());
+        }
+        if ("1".equals(item.getIsPraise())) { //0：未点赞 1：已点赞
+            helper.setImageResource(R.id.iv_like, R.drawable.icon_discovery_ask_like);
+        } else {
+            helper.setImageResource(R.id.iv_like, R.drawable.icon_discovery_ask_unlike);
+        }
 
-//        ViewGroup.LayoutParams layoutParams = helper.getView(R.id.ll_item_rv_enthusiast).getLayoutParams();
-//        layoutParams.height = new Random().nextInt(200)+500;
-//        helper.getView(R.id.ll_item_rv_enthusiast).setLayoutParams(layoutParams);
+        helper.addOnClickListener(R.id.ll_item_islike);
     }
 }

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

@@ -167,6 +167,7 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                 private String rentDiscountPrice;//租车优惠价格
                 private int rentDiscountStatus;//租车优惠状态 0–没有优惠;1–会员折扣;2–固定值
                 private int score;
+                private String coverPic;
 
                 public double getSum() {
                     BeanUserInfo.UserInfo info = null;
@@ -308,6 +309,14 @@ public class CarTypeListBean extends BaseBean implements Serializable {
                 public void setScore(int score) {
                     this.score = score;
                 }
+
+                public String getCoverPic() {
+                    return coverPic;
+                }
+
+                public void setCoverPic(String coverPic) {
+                    this.coverPic = coverPic;
+                }
             }
 
             public static class CompanyBean implements Serializable {

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

@@ -8,6 +8,9 @@ import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.chad.library.adapter.base.entity.MultiItemEntity;
+import com.frame.base.bus.Observer;
+import com.frame.base.bus.PaymentSuccessfulEvent;
+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,7 @@ import java.util.LinkedHashMap;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.schedulers.Schedulers;
 
 /**
  * Created :Auser
@@ -60,6 +64,7 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
     @Override
     protected void initView(Bundle savedInstanceState) {
 
+        initRxbus();
         recyclerView.setLayoutManager(new LinearLayoutManager(_mActivity));
         mAdapter = new CompletedAdapter(new ArrayList<MultiItemEntity>());
         mAdapter.setOnLoadMoreListener(this, recyclerView);
@@ -94,6 +99,17 @@ public class CompletedFragment extends BaseFragment<CommonPresenter> implements
         });
     }
 
+    private void initRxbus() {
+        RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
+                    @Override
+                    public void onNext(PaymentSuccessfulEvent event) {
+                        onRefresh();
+                    }
+                });
+    }
+
     @Override
     protected void loadData(Bundle savedInstanceState) {
 

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

@@ -114,7 +114,13 @@ public class EvaluationActivity extends BaseStatusActivity<PickerPresenter> {
 
         if (dataBean != null) {
             tvName.setText(dataBean.getName());
-            GlideManager.getInstance(mActivity).loadImage(dataBean.getIcon(), ivCar);
+            String icon ="";
+            if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                icon = dataBean.getCoverPic();
+            }else {
+                icon = dataBean.getIcon();
+            }
+            GlideManager.getInstance(mActivity).loadImage(icon, ivCar);
             if (dataBean.getType() == 1) {
                 if (dataBean.getOrderRentVehicleDetail() != null && !TextUtils.isEmpty(dataBean.getOrderRentVehicleDetail().getCost_detail())) {
                     tvContent.setText("");

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

@@ -150,12 +150,17 @@ public class ForPaymentFragment extends BaseFragment<CommonPresenter> implements
                     public void accept(PaymentSuccessfulEvent payEvent) throws Exception {
                         if (payPosition != -1) {
                             if (mAdapter != null && !mAdapter.getData().isEmpty()) {
+                                mAdapter.getData().get(payPosition);
                                 mAdapter.getData().remove(payPosition);
                                 mAdapter.notifyDataSetChanged();
                             }
                         }
-                        if (mListener != null) {
+                        if (mListener != null && payBean !=null) {
+                            if (payBean.getType() ==3){  //订单类型 1–租车；2–旅游 3-会员
                                 mListener.switchTab(3);
+                            }else {
+                                mListener.switchTab(1);
+                            }
                         }
                     }
                 });

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

@@ -6,6 +6,7 @@ import android.graphics.Bitmap;
 import android.graphics.BitmapFactory;
 import android.graphics.Canvas;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
@@ -98,7 +99,14 @@ public class PickUpTheCarQRCodeActivity extends BaseStatusActivity<PickerPresent
                 tvOutAddress.setText(detail.getEnd_addr());
                 tvOutTime.setText(TimeManager.stampToDate(String.valueOf(detail.getEnd_time())));
                 tvPrice.setText(String.format("¥%1$s", dataBean.getRealAmount()));
-                GlideManager.getInstance(mActivity).loadImage(dataBean.getIcon(), ivGoods);
+
+                String icon ="";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                    icon = dataBean.getCoverPic();
+                }else {
+                    icon = dataBean.getIcon();
+                }
+                GlideManager.getInstance(mActivity).loadImage(icon, ivGoods);
             }
         }
 

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

@@ -11,6 +11,7 @@ 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.Observer;
+import com.frame.base.bus.PaymentSuccessfulEvent;
 import com.frame.base.bus.RxBus;
 import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
@@ -114,6 +115,17 @@ public class ToTravelFragment extends BaseFragment<CommonPresenter> implements B
                     }
                 });
 
+
+
+        RxBus.tObservable(PaymentSuccessfulEvent.class)
+                .observeOn(Schedulers.newThread())
+                .subscribe(new Observer<PaymentSuccessfulEvent>(disposable) {
+                    @Override
+                    public void onNext(PaymentSuccessfulEvent event) {
+                        onRefresh();
+                    }
+                });
+
     }
 
 

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

@@ -46,7 +46,13 @@ public class CompletedAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_completed));
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
+                String icon ="";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                    icon = dataBean.getCoverPic();
+                }else {
+                    icon = dataBean.getIcon();
+                }
+                helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() !=null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));

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

@@ -54,7 +54,14 @@ public class ForPaymentAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity
                 }
 
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_for_payment));
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
+
+                String icon ="";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                    icon = dataBean.getCoverPic();
+                }else {
+                    icon = dataBean.getIcon();
+                }
+                helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));

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

@@ -46,7 +46,14 @@ public class HaveToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEnti
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
                 helper.setText(R.id.tv_order_state,mContext.getString(R.string.rv_order_have_travel));
-                helper.loadRoundImage(mContext,dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods),8);
+
+                String icon ="";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                    icon = dataBean.getCoverPic();
+                }else {
+                    icon = dataBean.getIcon();
+                }
+                helper.loadRoundImage(mContext,icon, (ImageView) helper.getView(R.id.iv_goods),8);
                 helper.setText(R.id.tv_car_type,dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() !=null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));

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

@@ -48,7 +48,13 @@ public class OrderListAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                 if (dataBean.getOrderRentVehicleDetail() != null && dataBean.getOrderRentVehicleDetail().getStart_city_name() != null) {
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
+                String icon ="";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                    icon = dataBean.getCoverPic();
+                }else {
+                    icon = dataBean.getIcon();
+                }
+                helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));

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

@@ -46,7 +46,13 @@ public class ToTravelAdapter extends BaseMultiItemQuickAdapter<MultiItemEntity,
                     helper.setText(R.id.tv_city, dataBean.getOrderRentVehicleDetail().getStart_city_name());
                 }
                 helper.setText(R.id.tv_order_state, mContext.getString(R.string.rv_order_to_travel));
-                helper.loadRoundImage(mContext, dataBean.getIcon(), (ImageView) helper.getView(R.id.iv_goods), 8);
+                String icon ="";
+                if (!TextUtils.isEmpty(dataBean.getCoverPic())){
+                    icon = dataBean.getCoverPic();
+                }else {
+                    icon = dataBean.getIcon();
+                }
+                helper.loadRoundImage(mContext, icon, (ImageView) helper.getView(R.id.iv_goods), 8);
                 helper.setText(R.id.tv_car_type, dataBean.getName());
                 if (dataBean.getOrderRentVehicleDetail() != null) {
                     helper.setText(R.id.tv_get_time, DateUtils.timestampToString1(dataBean.getOrderRentVehicleDetail().getStart_time()));

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

@@ -144,6 +144,15 @@ public class OrderListBean extends BaseBean implements Serializable {
             private OrderMemberDetail orderMemberDetail;
             private int detailId;
             private String name;
+            private String coverPic;
+
+            public String getCoverPic() {
+                return coverPic;
+            }
+
+            public void setCoverPic(String coverPic) {
+                this.coverPic = coverPic;
+            }
 
             public String getQrcodeStr() {
                 return qrcodeStr;

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

@@ -9,22 +9,36 @@
     <LinearLayout
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:background="@drawable/shape_rv_bg_write_semicircle"
         android:orientation="vertical">
 
+        <RelativeLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content">
 
             <ImageView
-            android:id="@+id/iv_activity"
+                android:id="@+id/iv_icon_pat"
                 android:layout_width="match_parent"
-            android:layout_height="@dimen/size_180"
-            android:scaleType="centerCrop" />
+                android:layout_height="wrap_content" />
+
+            <ImageView
+                android:id="@+id/iv_isvideo"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_centerInParent="true"
+                android:src="@drawable/icon_fragment_video_hint"/>
+
+        </RelativeLayout>
+
 
         <TextView
+            android:id="@+id/tv_title"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/size_5"
             android:paddingLeft="@dimen/size_5"
             android:paddingRight="@dimen/size_5"
+            android:maxLines="2"
+            android:ellipsize="end"
             android:text="行摄川西邂逅生命中未知的精彩"
             android:textColor="@color/colorMain"
             android:textSize="@dimen/text_14" />
@@ -34,8 +48,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="@dimen/size_5"
             android:layout_marginBottom="@dimen/size_10"
-            android:paddingLeft="@dimen/size_5"
-            android:paddingRight="@dimen/size_5">
+            android:paddingLeft="@dimen/size_5">
 
             <LinearLayout
                 android:layout_width="wrap_content"
@@ -43,12 +56,13 @@
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
-                <ImageView
+                <com.base.utils.ui.image.round.RoundImageView
+                    android:id="@+id/iv_user_icon"
                     android:layout_width="@dimen/size_15"
-                    android:layout_height="@dimen/size_15"
-                    android:src="@drawable/aa_ivava" />
+                    android:layout_height="@dimen/size_15" />
 
                 <TextView
+                    android:id="@+id/tv_user_name"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/size_3"
@@ -57,24 +71,30 @@
             </LinearLayout>
 
             <LinearLayout
+                android:id="@+id/ll_item_islike"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                android:paddingLeft="@dimen/size_15"
+                android:paddingTop="@dimen/size_5"
+                android:paddingBottom="@dimen/size_5"
+                android:paddingRight="@dimen/size_15"
                 android:layout_alignParentRight="true"
                 android:gravity="center_vertical"
                 android:orientation="horizontal">
 
                 <ImageView
+                    android:id="@+id/iv_like"
                     android:layout_width="@dimen/size_15"
                     android:layout_height="@dimen/size_15"
-                    android:padding="@dimen/size_1"
-                    android:src="@drawable/aa_icon_like" />
+                    android:padding="@dimen/size_1" />
 
                 <TextView
+                    android:id="@+id/iv_like_number"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_marginLeft="@dimen/size_3"
                     android:text="10589"
-                    android:textColor="#FFB74B"
+                    android:textColor="@color/textGray"
                     android:textSize="@dimen/text_8" />
             </LinearLayout>
         </RelativeLayout>

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

@@ -435,7 +435,6 @@ public class MineFragment extends BaseFragment<CommonPresenter> implements Simpl
         }
     }
 
-
     /**
      * 获取轮播图
      */

module_mine/src/main/java/com/rv/rvmine/traveler/PersonalInformationActivity.java

@@ -90,6 +90,8 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
     private String mUnionid;
     private String mHeadImg;
 
+    private String birthday;
+
     public static Intent getIntent(Context context, UserInfoBean.UserInfo info) {
         return new Intent(context, PersonalInformationActivity.class)
                 .putExtra("userinfo", info);
@@ -127,6 +129,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
                 etName.setText(info.getRealname());
             }
             if (info.getBirthday() != null) {
+                birthday = info.getBirthday();
                 tvDateOfBirth.setText(info.getBirthday());
             }
             if (info.getSex() != null) {
@@ -358,12 +361,11 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             return;
         }
 
-        String dataBirth = tvDateOfBirth.getText().toString();
-        if (TextUtil.isEmpty(dataBirth)) {
+        if (TextUtil.isEmpty(birthday)) {
             showToast("生日不为空！");
             return;
         }
-        mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, dataBirth, sex,mWXOpenid,mUnionid,mQQOpenid), getHeadMap(), true);
+        mPresenter.postBodyData(RvFrameConfig.ADMIN_POST, 1, ApiConfig.HTTP_URL_UPUSER_EDIT, BaseBean.class, new UserInfo(info.getId() + "", info.getUserid() + "", info.getUsername(), "0", nickName, info.getRealname(), ivAvatarUrl, birthday, sex,mWXOpenid,mUnionid,mQQOpenid), getHeadMap(), true);
     }
 
     private Map<String, Object> getHeadMap() {
@@ -577,6 +579,7 @@ public class PersonalInformationActivity extends BaseStatusActivity<PickerPresen
             @Override
             public void onTimeSelect(Date date, View v) {//选中事件回调
                 // 这里回调过来的v,就是show()方法里面所添加的 View 参数，如果show的时候没有添加参数，v则为null
+                birthday = getTime(date);
                 tvDateOfBirth.setText(getTime(date));
             }
         })

module_tourism/src/main/AndroidManifest.xml

@@ -3,7 +3,8 @@
     package="com.rv.tourism">
 
     <application>
-        <activity android:name=".other.TravelerConfirmOrderActivity"></activity>
+        <activity android:name=".other.TravelerConfirmOrderActivity">
+        </activity>
         <activity
             android:name=".other.TravelDetailsActivity"
             android:label="@string/title_activity_travel_details"

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

@@ -52,7 +52,13 @@ public class ConsumeRecordListAdapter extends BaseQuickAdapter<OrderListBean.Dat
 
                 if (!TextUtils.isEmpty(bean.getPicture())) {
                     ImageView imgCarType = helper.itemView.findViewById(R.id.img_car_type);
-                    GlideManager.getInstance(mContext).loadImage(bean.getIcon(), imgCarType);
+                    String icon ="";
+                    if (!TextUtils.isEmpty(bean.getCoverPic())){
+                        icon = bean.getCoverPic();
+                    }else {
+                        icon = bean.getIcon();
+                    }
+                    GlideManager.getInstance(mContext).loadImage(icon, imgCarType);
                 }
             }
             OrderListBean.DataBeanX.DataBean.OrderRentVehicleDetail vehicleDetail = bean.getOrderRentVehicleDetail();

plugin_version/src/main/res/layout/dialog_update_view.xml

@@ -15,8 +15,8 @@
         android:orientation="vertical">
 
         <ImageView
-            android:scaleType="fitXY"
-            android:layout_width="@dimen/dialog_width"
+            android:scaleType="centerCrop"
+            android:layout_width="match_parent"
             android:layout_height="@dimen/dialog_img_height"
             android:src="@drawable/icon_dialog_top" />