bug修复

RvWrapper/src/main/java/com/ruiwenliu/wrapper/util/glide/GlideManager.java

 package com.ruiwenliu.wrapper.util.glide;
 
 import android.content.Context;
+import android.graphics.Bitmap;
 import android.graphics.drawable.Drawable;
+import android.support.annotation.NonNull;
 import android.support.annotation.Nullable;
 import android.text.TextUtils;
 import android.util.Log;
@@ -18,7 +20,9 @@ import com.bumptech.glide.load.resource.bitmap.RoundedCorners;
 import com.bumptech.glide.load.resource.gif.GifDrawable;
 import com.bumptech.glide.request.RequestListener;
 import com.bumptech.glide.request.RequestOptions;
+import com.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.target.Target;
+import com.bumptech.glide.request.transition.Transition;
 import com.ruiwenliu.wrapper.R;
 import com.ruiwenliu.wrapper.util.ScaleUtils;
 
@@ -133,6 +137,9 @@ public class GlideManager {
 //                .apply(RequestOptions.bitmapTransform(new CenterCrop(),new RoundedCorners(round)))
                 .apply(RequestOptions.bitmapTransform(new GlideRoundTransform(mContext, round)))
                 .into(image);
+
+
+
     }
 
 
@@ -153,6 +160,7 @@ public class GlideManager {
                 .into(image);
     }
 
+
     /**
      * 加载圆角图片
      * 通过RequestOptions扩展功能,override:采样率,因为ImageView就这么大,可以压缩图片,降低内存消耗,设置图片压缩比例

module_camp/src/main/java/com/rv/camp/camp/CampShopShowActivity.java

@@ -156,7 +156,7 @@ public class CampShopShowActivity extends BaseStatusActivity<CampPresenter> {
      */
     private void getShopList(int page) {
         Map<String, Object> map = new LinkedHashMap<>();
-        map.put("page", 1000);
+        map.put("pageSize", 1000);
         mPresenter.getData(RvFrameConfig.VEHICLE_CAMPLIST, 0, CampApi.TRAVEL_CAMPSITESHOP, CampListBean.class, map, page == 1 ? false : false);
     }
 

module_discovery/src/main/java/com/xxfc/discovery/DiscoveryFragment.java

@@ -129,7 +129,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
         list.add(_mActivity.getString(R.string.discovery_recommend));
         list.add(_mActivity.getString(R.string.discovery_pat));
 //        list.add(_mActivity.getString(R.string.discovery_short_video));
-        list.add(_mActivity.getString(R.string.discovery_question_and_answer));
+//        list.add(_mActivity.getString(R.string.discovery_question_and_answer));
         menuAdapter.setNewData(list);
         menuAdapter.setOnItemClickListener(new BaseQuickAdapter.OnItemClickListener() {
             @Override
@@ -174,7 +174,7 @@ public class DiscoveryFragment extends BaseFragment<DiscoveryPresenter> {
         list.add(RecommendFragment.getInstance(TYPE_RECOMMEND));
         list.add(PatFragment.getInstance(TYPE_PAT));
 //        list.add(ShortVideoFragment.getInstance(TYPE_SHORT_VIDEO));
-        list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
+//        list.add(QuestionAndAnswerFragment.getInstance(TYPE_QUESTION_AND_ANSWER));
         return list;
     }
 

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

 package com.xxfc.discovery.adapter;
 
+import android.graphics.Bitmap;
+import android.support.annotation.NonNull;
+import android.support.annotation.Nullable;
+import android.view.Display;
+import android.view.ViewGroup;
 import android.widget.ImageView;
+
+import com.bumptech.glide.Glide;
+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.glide.GlideManager;
@@ -13,19 +22,38 @@ import com.xxfc.discovery.bean.DiscoveryRecommendBean;
 
 public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecommendBean.DataBeanX.DataBean, BaseViewHolder> {
 
-    public DiscoveryRecommendAdapter() {
+    private Display display;
+
+    public DiscoveryRecommendAdapter(Display display) {
         super(R.layout.rv_item_discovery_recommend);
+        this.display = display;
     }
 
+
+
     @Override
     protected void convert(BaseViewHolder helper, DiscoveryRecommendBean.DataBeanX.DataBean item) {
         if (item == null) {
             return;
         }
+
+
         DiscoveryRecommendBean.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),8);
+                Glide.with(mContext)
+                        .asBitmap()//强制Glide返回一个Bitmap对象
+                        .load(body.getImages().get(0).getOurl())
+                        .into(new SimpleTarget<Bitmap>() {
+                            @Override
+                            public void onResourceReady(@NonNull Bitmap bitmap, @Nullable Transition<? super Bitmap> transition) {
+                                ViewGroup.LayoutParams lp =helper.getView(R.id.iv_icon_pat).getLayoutParams();
+                                lp.height =  bitmap.getHeight() * (int) (display.getWidth() / 2 - 60 ) / bitmap.getWidth() ;
+                                helper.getView(R.id.iv_icon_pat).setLayoutParams(lp);
+                            }
+                        });
+
+                GlideManager.getInstance(mContext).loadRoundImage2(body.getImages().get(0).getOurl(), (ImageView) helper.getView(R.id.iv_icon_pat),8);
             }
             helper.setText(R.id.tv_title, body.getText());
             if ("4".equals(body.getType())) { //消息类型 基础属性 1=文字消息、2=图文消息、3=语音消息、4=视频消息、 5=文件消

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

@@ -2,12 +2,10 @@ package com.xxfc.discovery.fragment;
 
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
-import android.util.TypedValue;
+import android.view.Display;
 import android.view.View;
-
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.chad.library.adapter.base.BaseQuickAdapter;
 import com.frame.base.bus.Observer;
@@ -24,15 +22,11 @@ import com.xxfc.discovery.adapter.DiscoveryRecommendAdapter;
 import com.xxfc.discovery.api.DiscoveryApi;
 import com.xxfc.discovery.bean.DiscoveryIMTokenBean;
 import com.xxfc.discovery.bean.DiscoveryRecommendBean;
-import com.xxfc.discovery.event.DiscoveryAddEvent;
 import com.xxfc.discovery.event.PostPatEvent;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
 import com.yuyife.okgo.OkGoUtil;
-
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
-
 import butterknife.BindView;
 import io.reactivex.schedulers.Schedulers;
 
@@ -71,7 +65,10 @@ public class PatFragment extends BaseFragment<DiscoveryPresenter> implements Sim
         mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
         mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
         initRxbus();
-        mAdapter = new DiscoveryRecommendAdapter();
+
+        Display display = _mActivity.getWindowManager().getDefaultDisplay();
+
+        mAdapter = new DiscoveryRecommendAdapter(display);
 
         StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
         rvContent.setItemAnimator(null);

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

@@ -2,9 +2,9 @@ package com.xxfc.discovery.fragment;
 
 import android.graphics.Rect;
 import android.os.Bundle;
-import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
 import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.view.Display;
 import android.view.View;
 
 import com.alibaba.android.arouter.launcher.ARouter;
@@ -62,7 +62,8 @@ public class RecommendFragment extends BaseFragment<DiscoveryPresenter> implemen
     protected void initView(Bundle savedInstanceState) {
         mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
         mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
-        mRecommendAdapter = new DiscoveryRecommendAdapter();
+        Display display = _mActivity.getWindowManager().getDefaultDisplay();
+        mRecommendAdapter = new DiscoveryRecommendAdapter(display);
 
         StaggeredGridLayoutManager staggeredGridLayoutManager = new StaggeredGridLayoutManager(2, StaggeredGridLayoutManager.VERTICAL);
 

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

@@ -4,10 +4,10 @@ import android.graphics.Rect;
 import android.os.Bundle;
 import android.support.v7.widget.GridLayoutManager;
 import android.support.v7.widget.RecyclerView;
+import android.view.Display;
 import android.view.View;
 
 import com.chad.library.adapter.base.BaseQuickAdapter;
-import com.frame.rv.config.RvFrameConfig;
 import com.ruiwenliu.wrapper.base.BaseBean;
 import com.ruiwenliu.wrapper.base.BaseFragment;
 import com.ruiwenliu.wrapper.weight.refresh.SimpleRefreshLayout;
@@ -18,9 +18,7 @@ import com.xxfc.discovery.adapter.DiscoveryRecommendAdapter;
 import com.xxfc.discovery.api.DiscoveryApi;
 import com.xxfc.discovery.bean.DiscoveryRecommendBean;
 import com.xxfc.discovery.presenter.DiscoveryPresenter;
-import com.yuyife.okgo.OkGoUtil;
 
-import java.util.ArrayList;
 import java.util.LinkedHashMap;
 import java.util.Map;
 
@@ -58,7 +56,8 @@ public class ShortVideoFragment extends BaseFragment<DiscoveryPresenter>  implem
     protected void initView(Bundle savedInstanceState) {
         mSimpleRefreshLayout.setHeaderView(new SimpleRefreshView(_mActivity));
         mSimpleRefreshLayout.setOnSimpleRefreshListener(this);
-        mAdapter = new DiscoveryRecommendAdapter();
+        Display display = _mActivity.getWindowManager().getDefaultDisplay();
+        mAdapter = new DiscoveryRecommendAdapter(display);
         rvContent.setLayoutManager(new GridLayoutManager(_mActivity, 2));
         rvContent.addItemDecoration(new AbSpacesItemDecoration(15));// 分割线。
         rvContent.setAdapter(mAdapter);

module_discovery/src/main/res/layout/rv_item_discovery_recommend.xml

@@ -16,10 +16,9 @@
            android:layout_height="wrap_content">
 
            <ImageView
-               android:id="@+id/iv_icon"
+               android:id="@+id/iv_icon_pat"
                android:layout_width="match_parent"
-               android:layout_height="wrap_content"
-               android:scaleType="centerCrop" />
+               android:layout_height="wrap_content" />
 
            <ImageView
                android:id="@+id/iv_isvideo"
@@ -38,6 +37,8 @@
             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" />

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

@@ -59,6 +59,7 @@ import com.rv.home.R2;
 import com.rv.home.rv.module.ApiConfig;
 import com.rv.home.rv.module.basic.presenter.CommonPresenter;
 import com.rv.home.rv.module.ui.main.home.adapter.HotCarTypeAdapter;
+import com.rv.home.rv.module.ui.main.home.adapter.RVEnthusiastAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVTourListAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.RVTourListLabelAdapter;
 import com.rv.home.rv.module.ui.main.home.adapter.SelectedEventsAdapter;
@@ -233,7 +234,7 @@ 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;