优化弹出框显示

app/src/main/java/com/sheep/gamegroup/util/TestUtil.java

@@ -42,6 +42,7 @@ import com.sheep.gamegroup.model.entity.Video;
 import com.sheep.gamegroup.model.util.SheepSubscriber;
 import com.sheep.gamegroup.module.plugin.model.Plugin;
 import com.sheep.gamegroup.module.plugin.util.SheepPluginUtil;
+import com.sheep.gamegroup.module.yf_shop.model.ReceiveCouponsCheckResq;
 import com.sheep.gamegroup.usage.AppUsageManager;
 import com.sheep.gamegroup.util.js.BaseActWeb;
 import com.sheep.gamegroup.view.activity.ActInstallApkList;
@@ -256,7 +257,8 @@ public class TestUtil {
      */
     public static void test(final Activity activity) {
         final String[] items = {"复制token", "添加token", "复制打点数据", "从jenkins下载小绵羊安装包", "测试表情包",
-                "填写收件地址弹窗",  "朗读文字", "游戏搜索", "测试插件","测试bitmap", "剪切视频", "我的关注", "足迹",
+                "优惠券弹窗", "填写收件地址弹窗",
+                "朗读文字", "游戏搜索", "测试插件","测试bitmap", "剪切视频", "我的关注", "足迹",
                 "测试联通卡", "测试联通卡2", "测试签名1", "测试签名2", "测试孔剑秋faq正式服",
                 "跳转QQ1", "跳转QQ2", "跳转QQ3", "跳转白白QQ", "龙猫竞猜", "龙猫竞猜-scheme",
                 "有米科技", "手机型号测试", "测试通知栏", "测试自定义通知栏", "测试自定义通知栏2",
@@ -275,6 +277,11 @@ public class TestUtil {
                     @Override
                     public void onClick(DialogInterface dialog, int which) {
                         switch (items[which]) {
+                            case "优惠券弹窗":
+                                ReceiveCouponsCheckResq receiveCouponsCheckResq = new ReceiveCouponsCheckResq();
+                                receiveCouponsCheckResq.setAmount(6.0f);
+                                ViewUtil.showYfShopAd(activity, receiveCouponsCheckResq);
+                                break;
                             case "填写收件地址弹窗":
                                 ViewUtil.showYfShopAsk(activity, "继续邀请", activity.getString(R.string.yf_shop_ask_tip, "987654311"), dialog1 -> Jump2View.getInstance().goActInvitation(activity));
                                 break;
@@ -868,7 +875,7 @@ public class TestUtil {
 
     //开启后可 测试充值与绑定微信和身份信息逻辑 等
     public static boolean isDev() {
-//        return BuildConfig.DEBUG;
-        return false;
+        return BuildConfig.DEBUG;
+//        return false;
     }
 }

app/src/main/java/com/sheep/gamegroup/util/ViewUtil.java

@@ -1510,7 +1510,7 @@ public class ViewUtil {
     }
 
     //3.4.7添加 -- 展示商城优惠券领取对话框
-    public static void showYfShopAd(final Activity activity, ReceiveCouponsCheckResq data) {
+    public static void showYfShopAd(final Activity activity, ReceiveCouponsCheckResq receiveCouponsCheckResq) {
         if (activity != null) {
             View dialog_parent = View.inflate(activity, R.layout.dialog_parent, null);
             final AlertDialog dialog = new AlertDialog.Builder(activity, R.style.MyDialogActivityTheme)
@@ -1523,12 +1523,19 @@ public class ViewUtil {
             ViewUtil.setVisibility(dialog_title, false);
             dialog_center_ll.setBackgroundColor(Color.TRANSPARENT);
 
+            TextView dialog_yf_shop_ad_title_tv = view.findViewById(R.id.dialog_yf_shop_ad_title_tv);
+            View dialog_yf_shop_ad_yuan_ll = view.findViewById(R.id.dialog_yf_shop_ad_yuan_ll);
             TextView dialog_yf_shop_ad_yuan_tv = view.findViewById(R.id.dialog_yf_shop_ad_yuan_tv);
             TextView dialog_yf_shop_ad_tip_tv = view.findViewById(R.id.dialog_yf_shop_ad_tip_tv);
             TextView dialog_yf_shop_ad_btn_tv = view.findViewById(R.id.dialog_yf_shop_ad_btn_tv);
-
-            ViewUtil.setText(dialog_yf_shop_ad_yuan_tv, new SpannableSb().append("￥", R.dimen.text_size_2).append(data.getAmountText(), R.dimen.text_size_28).setTextStyle(Typeface.BOLD).getSsb());
-            ViewUtil.setText(dialog_yf_shop_ad_tip_tv, R.string.yf_shop_quan_tip, data.getAmountText());
+            float per = (G.WIDTH - G.getRealPix(80)) / 930.0f;
+            LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ad_title_tv, new Lp(per).setTopMargin(50));
+            LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ad_yuan_ll, new Lp(per).setTopMargin(200).setWidth(598).setHeight(153));
+            LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ad_tip_tv, new Lp(per).setWidth(500));
+            LayoutParamsUtil.resetLayoutParams(dialog_yf_shop_ad_btn_tv, new Lp(per).setBottomMargin(100));
+
+            ViewUtil.setText(dialog_yf_shop_ad_yuan_tv, new SpannableSb().append("￥", R.dimen.text_size_2).append(receiveCouponsCheckResq.getAmountText(), R.dimen.text_size_28).setTextStyle(Typeface.BOLD).getSsb());
+            ViewUtil.setText(dialog_yf_shop_ad_tip_tv, R.string.yf_shop_quan_tip, receiveCouponsCheckResq.getAmountText());
             dialog_close.setOnClickListener(new View.OnClickListener() {
                 @Override
                 public void onClick(View v) {
@@ -1549,9 +1556,9 @@ public class ViewUtil {
                                 @Override
                                 public void onNext(BaseMessage baseMessage) {
                                     G.showToast(baseMessage);
-                                    ReceiveCouponsResp data = baseMessage.getData(ReceiveCouponsResp.class);
-                                    if(data != null){
-                                        Jump2View.getInstance().goWeb(activity, data.getBuy_url(), Config.YF_SHOP_NAME);
+                                    ReceiveCouponsResp receiveCouponsResp = baseMessage.getData(ReceiveCouponsResp.class);
+                                    if(receiveCouponsResp != null){
+                                        Jump2View.getInstance().goWeb(activity, receiveCouponsResp.getBuy_url(), Config.YF_SHOP_NAME);
                                     }
                                 }
                             });

app/src/main/res/layout/dialog_yf_shop_ad.xml

@@ -1,24 +1,32 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
+<RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="wrap_content"
-    android:background="@drawable/bg_yf_shop_ad"
-    android:orientation="vertical">
+    android:layout_height="wrap_content">
+
+    <ImageView
+        android:id="@+id/dialog_yf_shop_ad_bg_iv"
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:adjustViewBounds="true"
+        android:scaleType="fitXY"
+        android:src="@drawable/bg_yf_shop_ad" />
 
     <TextView
+        android:id="@+id/dialog_yf_shop_ad_title_tv"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginTop="22dp"
+        android:layout_marginTop="50dp"
         android:gravity="center"
         android:text="@string/yf_shop_quan_title"
         android:textColor="#fff8532f"
         android:textSize="16sp" />
 
     <LinearLayout
+        android:id="@+id/dialog_yf_shop_ad_yuan_ll"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="33dp"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="100dp"
         android:background="@drawable/bg_yf_shop_ad_quan"
         android:gravity="center_vertical"
         android:orientation="horizontal">
@@ -45,11 +53,10 @@
 
     <TextView
         android:id="@+id/dialog_yf_shop_ad_tip_tv"
-        android:layout_width="match_parent"
+        android:layout_width="200dp"
         android:layout_height="wrap_content"
-        android:layout_marginStart="66dp"
-        android:layout_marginTop="22dp"
-        android:layout_marginEnd="66dp"
+        android:layout_centerInParent="true"
+        android:lineSpacingExtra="2dp"
         android:text="@string/yf_shop_quan_tip"
         android:textColor="#ff2b2813"
         android:textSize="13sp" />
@@ -58,12 +65,13 @@
         android:id="@+id/dialog_yf_shop_ad_btn_tv"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_gravity="center_horizontal"
-        android:layout_marginTop="70dp"
-        android:textStyle="bold"
-        android:gravity="center"
+        android:layout_centerHorizontal="true"
+        android:layout_alignBottom="@id/dialog_yf_shop_ad_bg_iv"
+        android:layout_marginBottom="50dp"
         android:background="@drawable/bg_yf_shop_btn"
+        android:gravity="center"
         android:text="进入商城"
         android:textColor="#fff64c2f"
-        android:textSize="13sp" />
-</LinearLayout>
+        android:textSize="13sp"
+        android:textStyle="bold" />
+</RelativeLayout>