bug修复

RvClient/build.gradle

@@ -8,8 +8,8 @@ android {
         minSdkVersion rootProject.ext.minSdkVersion
         targetSdkVersion rootProject.ext.targetSdkVersion
 
-        versionCode 132
-        versionName "1.3.2"
+        versionCode 134
+        versionName "1.3.4"
         multiDexEnabled true
 
         //新版Gradle 是 implementation 为了兼容compile,写上这句话

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

@@ -8,6 +8,7 @@ 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.bumptech.glide.request.target.SimpleTarget;
 import com.bumptech.glide.request.transition.Transition;
@@ -18,6 +19,8 @@ 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;
 
 /**
  * 推荐
@@ -33,7 +36,6 @@ public class DiscoveryRecommendAdapter extends BaseQuickAdapter<DiscoveryRecomme
     }
 
 
-
     @Override
     protected void convert(BaseViewHolder helper, DiscoveryRecommendBean.DataBeanX.DataBean item) {
         if (item == null) {
@@ -44,21 +46,29 @@ 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())
+//                        .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 - 30 ) / 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);
+
+                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);
                 Glide.with(mContext)
-                        .asBitmap()//强制Glide返回一个Bitmap对象
+                        .asBitmap()
                         .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);
+                        .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=文件消

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

@@ -11,7 +11,7 @@ public interface DiscoveryApi extends RvFrameConfig {
     String DISCOVERY_IMQUESTION_ADD = HOST + "/api/im/imQuestion/add";
 
     //获取推荐消息列表
-    String DISCOVERY_HOTMSG_LIST = HOST + "/api/im/app/unauth/hotMsg/list";
+    String DISCOVERY_HOTMSG_LIST = HOST + "/api/im/msg/app/unauth/hotMsg/list";
 
     //获取拍拍、短视频请求列表
     String DISCOVERY_UNAUTH_LIST = HOST + "/api/im/msg/app/unauth/list";

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

@@ -10,6 +10,8 @@ public class TransformationUtils extends ImageViewTarget<Bitmap> {
 
     private ImageView target;
 
+
+
     public TransformationUtils(ImageView target) {
         super(target);
         this.target = target;

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

@@ -513,10 +513,13 @@ public class ConfirmOrderActivity extends BaseStatusActivity<CommonPresenter> {
             return;
         }
 
+        payType = 1;
+
         new PaymentTypeSelection(mActivity) {
             @Override
             public void helper(final ViewHolder helper) {
                 super.helper(helper);
+
                 helper.setText(R.id.tv_amount, tvPayMoney.getText().toString());
                 helper.setOnClickListener(new View.OnClickListener() {
                     @Override

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

@@ -480,6 +480,7 @@ public class TravelerConfirmOrderActivity extends BaseStatusActivity<TourismPres
             return;
         }
 
+        payType = 1;
         new PaymentTypeSelection(mActivity) {
             @Override
             public void helper(final ViewHolder helper) {

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

@@ -105,7 +105,7 @@ public class MemberCenterActivity extends BaseStatusActivity<MemberPresenter> {
     @Override
     protected void onCreate(Bundle savedInstanceState) {
         super.onCreate(savedInstanceState);
-        EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);
+//        EnvUtils.setEnv(EnvUtils.EnvEnum.SANDBOX);
 //        StatusBarUtil.setRootViewFitsSystemWindows(mActivity, false);
     }
 

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

@@ -88,10 +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);
+//        if (listener == null) {
+//            listener = new RvUMAuthListener(context);
+//        }
+//        UMShareAPI.get(context).getPlatformInfo((Activity) context, SHARE_MEDIA.WEIXIN, listener);
     }
 
     /*****