Merge branch 'dev-member-john' of http://113.105.137.151:22280/lify/rvapp

RvClient/build.gradle

@@ -57,7 +57,7 @@ android {
             variant.outputs.all {
 
                 if (variant.buildType.name == 'release') {
-                    def productVersion = "RV" + releaseTime() + "V" + defaultConfig.versionName + "Release" + ".apk";
+                    def productVersion = "Rv" + releaseTime() + "V" + defaultConfig.versionName + "_Release_"+productFlavors[0].name + ".apk";
                     outputFileName = productVersion
                 }
             }

plugin_share/src/main/java/com/rv/share/view/PromotionDialog.java

@@ -4,8 +4,10 @@ import android.app.Dialog;
 import android.content.Context;
 import android.support.annotation.NonNull;
 import android.text.TextUtils;
+import android.view.Gravity;
 import android.view.LayoutInflater;
 import android.view.View;
+import android.view.ViewGroup;
 import android.view.WindowManager;
 import android.widget.Button;
 import android.widget.ImageView;
@@ -13,12 +15,13 @@ import android.widget.TextView;
 
 import com.bumptech.glide.Glide;
 import com.ruiwenliu.wrapper.bean.ActBean;
+import com.ruiwenliu.wrapper.dialog.BaseDialog;
 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 {
+public class PromotionDialog extends BaseDialog {
 
     public PromotionDialog(@NonNull Context context) {
         super(context);
@@ -26,6 +29,12 @@ public class PromotionDialog extends Dialog {
 
     public PromotionDialog(Context context, int themeResId) {
         super(context, themeResId);
+        setDialogParams(ViewGroup.LayoutParams.MATCH_PARENT,ViewGroup.LayoutParams.WRAP_CONTENT, Gravity.CENTER);
+    }
+
+    @Override
+    public int getViewLayout() {
+        return R.layout.dialog_promotion;
     }
 
     public static class Builder {

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

@@ -84,7 +84,6 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:singleLine="false"
-                                android:text="155****59180000000000000000000000"
                                 android:textColor="@color/colorMain"
                                 android:textSize="@dimen/text_18" />
 

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

@@ -5,20 +5,15 @@
     android:gravity="center"
     android:orientation="vertical">
 
-    <FrameLayout
-        android:layout_width="wrap_content"
-        android:layout_height="wrap_content"
-        android:minHeight="@dimen/dialog_min_height"
-        android:orientation="vertical">
 
     <ImageView
         android:id="@+id/img_bg"
-            android:layout_width="@dimen/dialog_act_width"
-            android:layout_height="@dimen/dialog_act_height"
-            android:minHeight="@dimen/dialog_min_height"
-            android:scaleType="fitXY" />
-
-    </FrameLayout>
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:layout_marginLeft="@dimen/size_30"
+        android:layout_marginRight="@dimen/size_30"
+        android:minWidth="@dimen/dialog_act_width"
+        android:minHeight="@dimen/dialog_act_height" />
 
     <ImageView
         android:id="@+id/img_close"

plugin_share/src/main/res/values-hdpi/dimens.xml

@@ -3,7 +3,7 @@
     <dimen name="dialog_width">150dp</dimen>
     <dimen name="dialog_min_height">150dp</dimen>
     <dimen name="dialog_act_width">150dp</dimen>
-    <dimen name="dialog_act_height">200dp</dimen>
+    <dimen name="dialog_act_height">150dp</dimen>
 
     <dimen name="height_share_ruler_top">108.34dp</dimen>
 </resources>

plugin_share/src/main/res/values-xhdpi/dimens.xml

@@ -3,7 +3,7 @@
     <dimen name="dialog_width">200dp</dimen>
     <dimen name="dialog_min_height">200dp</dimen>
     <dimen name="dialog_act_width">200dp</dimen>
-    <dimen name="dialog_act_height">266.67dp</dimen>
+    <dimen name="dialog_act_height">200dp</dimen>
 
     <dimen name="height_share_ruler_top">240.45dp</dimen>
 </resources>

plugin_share/src/main/res/values-xxhdpi/dimens.xml

@@ -4,7 +4,7 @@
     <dimen name="dialog_min_height">300dp</dimen>
 
     <dimen name="dialog_act_width">300dp</dimen>
-    <dimen name="dialog_act_height">400dp</dimen>
+    <dimen name="dialog_act_height">300dp</dimen>
     
     
     <dimen name="height_share_ruler_top">216.67dp</dimen>