bug修复

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

@@ -8,11 +8,14 @@ import android.view.ViewGroup;
 import android.widget.ImageView;
 
 import com.bumptech.glide.Glide;
+import com.bumptech.glide.request.RequestOptions;
 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;
+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;
 
@@ -41,7 +44,6 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
         DiscoveryRecommendBean.DataBeanX.DataBean.Body body = item.getBody();
         if (body != null) {
             if (body.getImages() != null && body.getImages().size() > 0) {
-
                 Glide.with(mContext)
                         .asBitmap()//强制Glide返回一个Bitmap对象
                         .load(body.getImages().get(0).getOurl())
@@ -49,7 +51,7 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
                             @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) / bitmap.getWidth() ;
+                                lp.height =  bitmap.getHeight() * (int) (display.getWidth() / 2 - 60 ) / bitmap.getWidth() ;
                                 helper.getView(R.id.iv_icon_pat).setLayoutParams(lp);
                             }
                         });

module_discovery/src/main/java/com/xxfc/discovery/utils/TransformationUtils.java

+package com.xxfc.discovery.utils;
+
+import android.graphics.Bitmap;
+import android.view.ViewGroup;
+import android.widget.ImageView;
+
+import com.bumptech.glide.request.target.ImageViewTarget;
+
+public class TransformationUtils extends ImageViewTarget<Bitmap> {
+
+    private ImageView target;
+
+    public TransformationUtils(ImageView target) {
+        super(target);
+        this.target = target;
+    }
+
+    @Override
+    protected void setResource(Bitmap resource) {
+        target.setImageBitmap(resource);
+
+        if (resource == null) return;
+        //获取原图的宽高
+        int width = resource.getWidth();
+        int height = resource.getHeight();
+
+        //获取imageView的宽
+        int imageViewWidth = target.getWidth();
+
+        //计算缩放比例
+        float sy = (float) (imageViewWidth * 0.1) / (float) (width * 0.1);
+
+        //计算图片等比例放大后的高
+        int imageViewHeight = (int) (height * sy);
+        ViewGroup.LayoutParams params = target.getLayoutParams();
+        params.height = imageViewHeight;
+        target.setLayoutParams(params);
+    }
+}
\ No newline at end of file

plugin_points/src/main/java/com/rv/points/Actions.java

 package com.rv.points;
 
 import android.app.Activity;
+import android.app.ProgressDialog;
 import android.content.ComponentName;
 import android.content.Context;
 import android.content.Intent;
+import android.widget.Toast;
 
 import com.alibaba.android.arouter.launcher.ARouter;
 import com.frame.base.url.Constance;
+import com.umeng.socialize.UMAuthListener;
+import com.umeng.socialize.UMShareAPI;
+import com.umeng.socialize.bean.SHARE_MEDIA;
+import com.umeng.socialize.utils.SocializeUtils;
 
-import java.math.BigDecimal;
+import java.util.Map;
 
 public class Actions {
 
+    private RvUMAuthListener listener;
+
     public Actions() {
     }
 
@@ -80,7 +88,10 @@ public class Actions {
      * @param context
      */
     public void bindwechat(Context context) {
-
+        if (listener == null) {
+            listener = new RvUMAuthListener(context);
+        }
+        UMShareAPI.get(context).getPlatformInfo((Activity) context, SHARE_MEDIA.WEIXIN, listener);
     }
 
     /*****
@@ -145,4 +156,43 @@ public class Actions {
         intent.putExtra("to", "discovery");
         context.startActivity(intent);
     }
+
+
+    private class RvUMAuthListener implements UMAuthListener {
+
+        private Context mContext;
+        private ProgressDialog dialog;
+
+        public RvUMAuthListener(Context context) {
+            this.mContext = context;
+            dialog = new ProgressDialog(mContext);
+        }
+
+        @Override
+        public void onStart(SHARE_MEDIA share_media) {
+            if (dialog != null)
+                SocializeUtils.safeShowDialog(dialog);
+        }
+
+        @Override
+        public void onComplete(SHARE_MEDIA share_media, int i, Map<String, String> map) {
+            if (dialog != null) {
+                SocializeUtils.safeCloseDialog(dialog);
+            }
+//            RxBus.post(new BindWechatEvent(map.get("iconurl"), map.get("unionid"), map.get("openid"), map.get("name")));
+        }
+
+        @Override
+        public void onError(SHARE_MEDIA share_media, int i, Throwable throwable) {
+            if (dialog != null)
+                SocializeUtils.safeCloseDialog(dialog);
+            Toast.makeText(mContext, "绑定微信失败" + throwable.getMessage(), Toast.LENGTH_SHORT).show();
+        }
+
+        @Override
+        public void onCancel(SHARE_MEDIA share_media, int i) {
+            if (dialog != null)
+                SocializeUtils.safeCloseDialog(dialog);
+        }
+    }
 }

plugin_points/src/main/java/com/rv/points/BindWechatEvent.java

+package com.rv.points;
+
+import com.frame.base.bus.Event;
+
+public class BindWechatEvent extends Event {
+    String headImg;
+    String unionid;
+    String WXOpenid;
+    String name;
+
+    public BindWechatEvent() {
+
+    }
+
+    public BindWechatEvent(String headImg, String unionid, String WXOpenid, String name) {
+        this.headImg = headImg;
+        this.unionid = unionid;
+        this.WXOpenid = WXOpenid;
+        this.name = name;
+    }
+}

plugin_points/src/main/java/com/rv/points/PointsActivity.java

 package com.rv.points;
 
+import android.annotation.SuppressLint;
 import android.content.Intent;
 import android.graphics.Color;
 import android.os.Build;
@@ -13,14 +14,20 @@ import android.text.Spanned;
 import android.text.TextUtils;
 import android.text.style.AbsoluteSizeSpan;
 import android.text.style.ForegroundColorSpan;
+import android.util.Log;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.LinearLayout;
 import android.widget.TextView;
 
+import com.alibaba.android.arouter.launcher.ARouter;
 import com.base.utils.ui.image.round.RoundImageView;
 import com.bumptech.glide.Glide;
 import com.chad.library.adapter.base.BaseQuickAdapter;
+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.BaseStatusActivity;
@@ -31,6 +38,7 @@ import com.rv.component.utils.RvCache;
 import com.rv.component.utils.CacheEnum;
 import com.rv.component.utils.DisplayUtil;
 import com.rv.home.rv.module.ApiConfig;
+import com.rv.home.rv.module.ui.main.home.order.OrderListActivity;
 import com.rv.points.adapter.PointAdapter;
 import com.rv.points.bean.PointBean;
 import com.rv.points.bean.RulerBean;
@@ -44,6 +52,9 @@ import java.util.List;
 import java.util.Map;
 
 import butterknife.BindView;
+import io.reactivex.disposables.Disposable;
+import io.reactivex.functions.Consumer;
+import io.reactivex.schedulers.Schedulers;
 
 public class PointsActivity extends BaseStatusActivity<PointPresenter> {
 
@@ -59,6 +70,7 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
     ImageView imgBack;
     private PointAdapter adapter;
     private UserInfoBean userInfo;
+    private Disposable disposable = null;
 
     private List<PointBean.RvPointItem> points = new ArrayList<>();
 
@@ -199,4 +211,16 @@ public class PointsActivity extends BaseStatusActivity<PointPresenter> {
         getUserPointInfo();
         getPointList();
     }
+
+//    @SuppressLint("CheckResult")
+//    private void initRxBus() {
+//        disposable = RxBus.tObservable(BindWechatEvent.class)
+//                .observeOn(Schedulers.io())
+//                .subscribe(new Consumer<BindWechatEvent>() {
+//                    @Override
+//                    public void accept(BindWechatEvent event) throws Exception {
+//
+//                    }
+//                });
+//    }
 }

plugin_share/src/main/res/layout/activity_reative_bill.xml

@@ -54,14 +54,17 @@
                 <LinearLayout
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
+                    android:gravity="center_horizontal"
                     android:orientation="vertical">
 
                     <ImageView
-                        android:layout_width="match_parent"
+                        android:layout_width="wrap_content"
                         android:layout_height="wrap_content"
                         android:src="@drawable/bg_bill" />
 
                     <LinearLayout
+                        android:layout_marginRight="@dimen/size_20"
+                        android:layout_marginLeft="@dimen/size_20"
 
                         android:layout_width="match_parent"
                         android:layout_height="wrap_content"

plugin_share/src/main/res/layout/activity_share_ruler.xml

@@ -17,9 +17,9 @@
             android:orientation="vertical">
 
             <ImageView
-                android:scaleType="fitXY"
                 android:layout_width="match_parent"
                 android:layout_height="@dimen/height_share_ruler_top"
+                android:scaleType="fitXY"
                 android:src="@drawable/banner_share_ruler_top" />
 
             <TextView