Merge branch 'dev_ad' of http://39.97.65.143:81/android/android_goodmoney into dev_ad

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/widgets/dialog/FlDialog.kt

@@ -25,6 +25,7 @@ class FlDialog(data: FlActivityBean.ActiveTipsConfigDTO, context: Context, priva
     private val iv_fl: ImageView
     private val tv_1: TextView
     private val tv_2: TextView
+    private val tv_fl_dialog_context: TextView
 
     init {
         setContentView(R.layout.dialog_fl)
@@ -47,9 +48,11 @@ class FlDialog(data: FlActivityBean.ActiveTipsConfigDTO, context: Context, priva
         iv_fl = findViewById(R.id.iv_fl)
         tv_1 = findViewById(R.id.tv_1)
         tv_2 = findViewById(R.id.tv_2)
+        tv_fl_dialog_context = findViewById(R.id.tv_fl_dialog_context)
 
         tv_1.text=data.title
         tv_2.text=data.hotTitle
+        tv_fl_dialog_context.text=data.context
         //显示图片
         //显示图片
         GlideUtils.loadImageViewLoding(context,data.url,iv_fl,R.mipmap.fl_zwf)

GoodMoney/app/src/main/res/layout/dialog_fl.xml

 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="300dp"
-    android:layout_height="400dp"
+    android:layout_width="310dp"
+    android:layout_height="420dp"
     android:background="@mipmap/bg_fl">
 
     <ImageView
@@ -15,9 +15,9 @@
         android:src="@mipmap/iv_close_tx" />
 
     <androidx.appcompat.widget.LinearLayoutCompat
-        android:layout_width="wrap_content"
+        android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginBottom="10dp"
+        android:layout_marginBottom="20dp"
         android:layout_gravity="bottom|center_horizontal"
         android:orientation="vertical">
 
@@ -55,25 +55,29 @@
         </RelativeLayout>
 
         <TextView
+            android:id="@+id/tv_fl_dialog_context"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:layout_marginLeft="5dp"
-            android:layout_marginRight="5dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
             android:layout_marginBottom="10dp"
             android:lineHeight="20dp"
-            android:text="恭喜获得加速赚钱特权，赚取金币\n快人一步!"
+            android:text="恭喜"
             android:textColor="#CCffffff"
             android:textSize="16sp" />
 
         <ImageView
             android:id="@+id/iv_fl"
-            android:layout_width="240dp"
+            android:layout_width="match_parent"
             android:layout_height="140dp"
+            android:layout_marginLeft="20dp"
+            android:layout_marginRight="20dp"
+            android:layout_marginTop="4dp"
+            android:scaleType="fitXY"
             android:layout_gravity="center_horizontal"
             android:layout_marginBottom="10dp"
-            android:gravity="center"
-            android:padding="6dp" />
+            android:gravity="center" />
 
         <TextView
             android:id="@+id/tv_focus"