修改活动弹框;修改旅游详情的顶部样式；修改推广有礼规则中的错别字

module_tourism/src/main/res/layout/activity_travel_details.xml

@@ -4,74 +4,6 @@
     android:layout_height="match_parent"
     android:orientation="vertical">
 
-    <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
-        android:id="@+id/lay_title"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/size_55"
-        android:background="@color/colorWrite">
-
-        <ImageView
-            android:id="@+id/iv_back"
-            android:layout_width="@dimen/size_32"
-            android:layout_height="@dimen/size_32"
-            android:layout_centerVertical="true"
-            android:layout_marginLeft="@dimen/size_5"
-            android:padding="@dimen/size_8"
-            android:src="@drawable/rv_common_icon_back_dark" />
-
-        <TextView
-            android:id="@+id/tv_center"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:ellipsize="end"
-            android:gravity="center"
-            android:maxWidth="320dp"
-            android:maxLines="1"
-            android:textColor="@color/textMain"
-            android:textSize="@dimen/text_18" />
-
-        <LinearLayout
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_alignParentRight="true"
-            android:layout_centerVertical="true"
-            android:gravity="center_vertical"
-            android:orientation="horizontal">
-
-            <ImageView
-                android:id="@+id/iv_collect"
-                android:layout_width="@dimen/size_32"
-                android:layout_height="@dimen/size_32"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="@dimen/size_5"
-                android:padding="@dimen/size_8"
-                android:src="@drawable/tourism_rv_collect" />
-
-            <ImageView
-                android:id="@+id/iv_share"
-                android:layout_width="@dimen/size_32"
-                android:layout_height="@dimen/size_32"
-                android:layout_centerVertical="true"
-                android:layout_marginRight="@dimen/size_5"
-                android:padding="@dimen/size_8"
-                android:src="@drawable/tourism_rv_rentingcar_icon_share" />
-
-        </LinearLayout>
-    </RelativeLayout>
-
-    <include layout="@layout/common_line" />
-
-    <ProgressBar
-        android:id="@+id/pb_progress"
-        style="?android:attr/progressBarStyleHorizontal"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/size_3"
-        android:indeterminateOnly="false"
-        android:max="100"
-        android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
-        android:visibility="gone"></ProgressBar>
-
     <FrameLayout
         android:layout_width="match_parent"
         android:layout_height="match_parent">
@@ -81,6 +13,81 @@
             android:layout_width="match_parent"
             android:layout_height="match_parent" />
 
+        <LinearLayout
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:orientation="vertical">
+
+            <RelativeLayout
+                android:id="@+id/lay_title"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/size_55"
+                android:layout_gravity="top">
+
+                <ImageView
+                    android:id="@+id/iv_back"
+                    android:layout_width="@dimen/size_32"
+                    android:layout_height="@dimen/size_32"
+                    android:layout_centerVertical="true"
+                    android:layout_marginLeft="@dimen/size_5"
+                    android:padding="@dimen/size_8"
+                    android:src="@drawable/rv_common_icon_back_dark" />
+
+                <TextView
+                    android:id="@+id/tv_center"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_centerInParent="true"
+                    android:ellipsize="end"
+                    android:gravity="center"
+                    android:maxWidth="320dp"
+                    android:maxLines="1"
+                    android:textColor="@color/white"
+                    android:textSize="@dimen/text_18"
+                    android:visibility="gone" />
+
+                <LinearLayout
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_alignParentRight="true"
+                    android:layout_centerVertical="true"
+                    android:gravity="center_vertical"
+                    android:orientation="horizontal">
+
+                    <ImageView
+                        android:id="@+id/iv_collect"
+                        android:layout_width="@dimen/size_32"
+                        android:layout_height="@dimen/size_32"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="@dimen/size_5"
+                        android:padding="@dimen/size_8"
+                        android:src="@drawable/tourism_rv_collect" />
+
+                    <ImageView
+                        android:id="@+id/iv_share"
+                        android:layout_width="@dimen/size_32"
+                        android:layout_height="@dimen/size_32"
+                        android:layout_centerVertical="true"
+                        android:layout_marginRight="@dimen/size_5"
+                        android:padding="@dimen/size_8"
+                        android:src="@drawable/tourism_rv_rentingcar_icon_share" />
+
+                </LinearLayout>
+            </RelativeLayout>
+
+            <!--<include layout="@layout/common_line" />-->
+
+            <ProgressBar
+                android:id="@+id/pb_progress"
+                style="?android:attr/progressBarStyleHorizontal"
+                android:layout_width="match_parent"
+                android:layout_height="@dimen/size_3"
+                android:indeterminateOnly="false"
+                android:max="100"
+                android:progressDrawable="@drawable/shape_rv_bg_yellow_progress"
+                android:visibility="gone"></ProgressBar>
+        </LinearLayout>
+
         <LinearLayout
             android:id="@+id/ll_item_bottom"
             android:layout_width="match_parent"
@@ -97,11 +104,11 @@
 
 
                 <TextView
-                    android:background="@color/white"
                     android:id="@+id/tv_customer_service"
                     android:layout_width="0dp"
                     android:layout_height="match_parent"
                     android:layout_weight="1"
+                    android:background="@color/white"
                     android:gravity="center"
                     android:text="联系客服"
                     android:textColor="@color/colorMain"

plugin_share/src/main/java/com/rv/share/ReativeBillActivity.java

@@ -72,7 +72,7 @@ public class ReativeBillActivity extends BaseStatusActivity<ReativeBillPresenter
         titleView.setVisibility(View.GONE);
         url = intent.getStringExtra("url");
         if (!TextUtils.isEmpty(url)) {
-            Bitmap bitmap = ZxingUtils.createQRImage(url, DisplayUtil.dip2px(this, 150), DisplayUtil.dip2px(this, 150), BitmapFactory.decodeResource(getResources(), com.rv.home.R.mipmap.ic_launcher));
+            Bitmap bitmap = ZxingUtils.createQRImage(url, DisplayUtil.dip2px(this, 150), DisplayUtil.dip2px(this, 150), BitmapFactory.decodeResource(getResources(),R.mipmap.logo));
 
             imgQrcode.setImageBitmap(bitmap);
         }

plugin_share/src/main/java/com/rv/share/utils/TransformationUtils.java

+package com.rv.share.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_share/src/main/java/com/rv/share/view/PromotionDialog.java

@@ -11,9 +11,12 @@ import android.widget.Button;
 import android.widget.ImageView;
 import android.widget.TextView;
 
+import com.bumptech.glide.Glide;
 import com.ruiwenliu.wrapper.bean.ActBean;
 import com.ruiwenliu.wrapper.util.glide.GlideManager;
+import com.ruiwenliu.wrapper.util.glide.GlideOptions;
 import com.rv.share.R;
+import com.rv.share.utils.TransformationUtils;
 
 public class PromotionDialog extends Dialog {
 
@@ -61,7 +64,15 @@ public class PromotionDialog extends Dialog {
             dialog.addContentView(layout, new WindowManager.LayoutParams(WindowManager.LayoutParams.MATCH_PARENT, WindowManager.LayoutParams.WRAP_CONTENT));
             this.imgBg = layout.findViewById(R.id.img_bg);
             if (this.act != null && !TextUtils.isEmpty(this.act.getBackground())) {
-                GlideManager.getInstance(mContext).loadImage2(this.act.getBackground(), this.imgBg);
+
+                GlideOptions options = GlideOptions.placeholderOf(com.ruiwenliu.wrapper.R.drawable.glide_icon_placeholder).
+                        error(com.ruiwenliu.wrapper.R.drawable.glide_icon_error);
+
+                Glide.with(mContext)
+                        .asBitmap()
+                        .load(this.act.getBackground())
+                        .apply(options)
+                        .into(new TransformationUtils(this.imgBg));
             }
             this.imgClose = layout.findViewById(R.id.img_close);
             layout.setOnClickListener(mListener);

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

@@ -208,7 +208,7 @@
                 android:text="1、满足下列条件的好友，可通过您分享的推广链接/码，领取的房车新人专享优惠券（券有效期15~60天）：\n
    a、好友有下载APP；\n
    b、好友为新用户并未进行过注册；\n
-   c、好友的当前账号中无的房车新手券。\n
+   c、好友的当前账号中无滴房车新手券。\n
      \n
 2、您的好友在注册后2个月内体验的房车，确认行程并完成支付，您可获得邀请奖励；奖励将在您的好友成功支付订单后24小时内到账。\n
 \n
@@ -233,7 +233,7 @@
                 <ImageView
                     android:layout_width="@dimen/size_50"
                     android:layout_height="@dimen/size_50"
-                    android:src="@drawable/logo" />
+                    android:src="@mipmap/logo" />
 
                 <LinearLayout
                     android:layout_width="wrap_content"