checkin dialog ui update

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

@@ -534,13 +534,21 @@ public class ViewUtil {
                 .create();
         if (action1 != null)
             action1.call(view);
-
+        View container = view.findViewById(R.id.dialog_center_ll);
         ImageView ivClose = view.findViewById(R.id.dialog_close);
+        View adTitleView = view.findViewById(R.id.money_title_view);
         final ImageView adPicView = view.findViewById(R.id.ad_iv);
         if (ad != null) {
             setImage(adPicView, ad.getAd_img());
             adPicView.setOnClickListener(v -> AdHelper.goAdLink(mActivity, ad));
             AdHelper.stat(ad.getAd_id(), 1);
+            setVisibility(adTitleView, true);
+            setVisibility(adPicView, true);
+            container.setBackgroundResource(R.mipmap.checkin_bg_full);
+        } else {
+            setVisibility(adTitleView, false);
+            setVisibility(adPicView, false);
+            container.setBackgroundResource(R.mipmap.checkin_bg_half);
         }
 
         ivClose.setOnClickListener(v -> mAlertDialog.dismiss());

app/src/main/java/com/sheep/jiuyan/samllsheep/ui/activity/SignActivity.java

@@ -350,7 +350,7 @@ public class SignActivity extends BaseUMActivity {
                     public void onNext(BaseMessage baseMessage) {
                         SheepSignResult sheepSignResult = baseMessage.getData(SheepSignResult.class);
                         if (sheepSignResult != null) {
-                            tryShowSignResultAndTask("补签成功", sheepSignResult.getAmount());
+                            tryShowSignResultAndTask(R.mipmap.checkin_success, sheepSignResult.getAmount());
                             hasMissSign = false;
                         }
                         // 重新请求签到状态接口
@@ -378,13 +378,13 @@ public class SignActivity extends BaseUMActivity {
                         final SheepSignResult sheepSignResult = baseMessage.getData(SheepSignResult.class);
                         if (sheepSignResult != null) {
                             if (sheepSignResult.isSign()) {
-                                tryShowSignResultAndTask("签到成功", sheepSignResult.getAmount());
+                                tryShowSignResultAndTask(R.mipmap.checkin_success, sheepSignResult.getAmount());
                             } else {
                                 aEggGoOut(NumberFormatUtils.retainMost2(sheepSignResult.getAmount()), new Action1<Animation>() {
 
                                     @Override
                                     public void call(Animation animation) {
-                                        tryShowSignResultAndTask("签到成功", sheepSignResult.getAmount());
+                                        tryShowSignResultAndTask(R.mipmap.checkin_success, sheepSignResult.getAmount());
                                     }
                                 });
                             }
@@ -401,28 +401,28 @@ public class SignActivity extends BaseUMActivity {
                     }
                 });
     }
+//
+//    private void showSignResultAndTask(final String title, final double money, CommendTask robTask) {
+//        ViewUtil.newInstance().showRobDutyDialog(this, robTask, R.layout.dialog_sign_result_and_task, new Action1<View>() {
+//            @Override
+//            public void call(View view) {
+//                ViewUtil.setText((TextView) view.findViewById(R.id.sign_window_title), title);
+//                ViewUtil.setText((TextView) view.findViewById(R.id.sign_money_number), String.format(Locale.CHINA, "+%s", NumberFormatUtils.retainMost2(money)));
+//            }
+//        });
+//    }
 
-    private void showSignResultAndTask(final String title, final double money, CommendTask robTask) {
-        ViewUtil.newInstance().showRobDutyDialog(this, robTask, R.layout.dialog_sign_result_and_task, new Action1<View>() {
-            @Override
-            public void call(View view) {
-                ViewUtil.setText((TextView) view.findViewById(R.id.sign_window_title), title);
-                ViewUtil.setText((TextView) view.findViewById(R.id.sign_money_number), String.format(Locale.CHINA, "+%s", NumberFormatUtils.retainMost2(money)));
-            }
-        });
-    }
-
-    private void showSignResult(String title, double money, SheepAd ad) {
+    private void showSignResult(int imageResId, double money, SheepAd ad) {
         ViewUtil.newInstance().showCheckinAdDialog(this, ad, R.layout.dialog_sign_result_and_task, new Action1<View>() {
             @Override
             public void call(View view) {
-                ViewUtil.setText((TextView) view.findViewById(R.id.sign_window_title), title);
+                ViewUtil.setImage((ImageView) view.findViewById(R.id.dialog_top_iv), imageResId);
                 ViewUtil.setText((TextView) view.findViewById(R.id.sign_money_number), String.format(Locale.CHINA, "+%s", NumberFormatUtils.retainMost2(money)));
             }
         });
     }
 
-    private void tryShowSignResultAndTask(final String title, final double money) {
+    private void tryShowSignResultAndTask(final int imageResId, final double money) {
 //        CommonUtil.getInstance().robTask(new Action1<CommendTask>() {
 //            @Override
 //            public void call(CommendTask robTask) {
@@ -441,9 +441,9 @@ public class SignActivity extends BaseUMActivity {
 //        });
         CommonUtil.getInstance().refreshAds(SheepAd.FORM_CHECKIN, (ret, ads) -> {
             if (!ret || ads.size() == 0) {
-                showSignResult(title, money, null);
+                showSignResult(imageResId, money, null);
             } else {
-                showSignResult(title, money, ads.get(0));
+                showSignResult(imageResId, money, ads.get(0));
             }
 
         });
@@ -504,7 +504,7 @@ public class SignActivity extends BaseUMActivity {
                     public void onNext(BaseMessage baseMessage) {
                         SheepSignResult sheepSignResult = baseMessage.getData(SheepSignResult.class);
                         if (sheepSignResult != null) {
-                            tryShowSignResultAndTask("刮奖成功", sheepSignResult.getAmount());
+                            tryShowSignResultAndTask(R.mipmap.checkin_congratulations, sheepSignResult.getAmount());
                         }
                         sign_gua_jiang_qu.setVisibility(View.GONE);
                         initUserSignLastScratch();

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

@@ -1,185 +1,97 @@
 <?xml version="1.0" encoding="utf-8"?>
-<FrameLayout 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="match_parent">
+    android:layout_height="match_parent"
+    android:layout_gravity="center">
 
     <RelativeLayout
+        android:id="@+id/dialog_center_ll"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_gravity="center"
-        android:layout_margin="@dimen/dp_10">
+        android:background="@mipmap/checkin_bg_full"
+        android:layout_centerInParent="true"
+        android:orientation="vertical"
+        android:layout_margin="8dp"
+        android:padding="16dp">
+
+        <ImageView
+            android:id="@+id/dialog_top_iv"
+            android:src="@mipmap/checkin_congratulations"
+            android:adjustViewBounds="true"
+            android:layout_centerHorizontal="true"
+            android:layout_marginTop="20dp"
+            android:layout_width="240dp"
+            android:layout_height="wrap_content" />
 
         <LinearLayout
-            android:id="@+id/dialog_center_ll"
-            android:layout_width="match_parent"
+            android:id="@+id/dialog_award_container"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:background="@drawable/bulletwindow"
-            android:gravity="center_horizontal"
-            android:orientation="vertical"
-            android:padding="16dp">
+            android:layout_marginTop="12dp"
+            android:layout_below="@+id/dialog_top_iv"
+            android:background="@drawable/shape_sign_window_money_bg"
+            android:gravity="center"
+            android:layout_centerHorizontal="true"
+            android:orientation="horizontal"
+            android:paddingLeft="10dp"
+            android:paddingTop="5dp"
+            android:paddingRight="10dp"
+            android:paddingBottom="5dp">
 
             <TextView
-                android:id="@+id/sign_window_title"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:text="签到成功"
-                android:textColor="#ffffffff"
-                android:textSize="36sp" />
-
-            <LinearLayout
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
-                android:background="@drawable/shape_sign_window_money_bg"
                 android:gravity="center"
-                android:orientation="horizontal"
-                android:paddingLeft="10dp"
-                android:paddingTop="5dp"
-                android:paddingRight="10dp"
-                android:paddingBottom="5dp">
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="已签到"
-                    android:textColor="#ff1c9cf9"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:id="@+id/sign_money_number"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="+0.01"
-                    android:textColor="#FE5864"
-                    android:textSize="12sp" />
-
-                <TextView
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:gravity="center"
-                    android:text="元"
-                    android:textColor="#ff1c9cf9"
-                    android:textSize="12sp" />
-            </LinearLayout>
-
-            <ImageView
-                android:id="@+id/ad_iv"
-                android:adjustViewBounds="true"
-                android:scaleType="center"
-                android:layout_marginTop="60dp"
-                android:maxHeight="150dp"
-                android:minHeight="100dp"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content" />
+                android:text="已签到"
+                android:textColor="#ff1c9cf9"
+                android:textSize="12sp" />
 
             <TextView
-                android:id="@+id/money_title_view"
+                android:id="@+id/sign_money_number"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="60dp"
-                android:text="今日赚钱推荐"
-                android:textColor="#ff089dfa"
-                android:visibility="gone"
-                android:textSize="18sp" />
-
-            <LinearLayout
-                android:id="@+id/money_task_view"
-                android:visibility="gone"
-                android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="25dp"
-                android:background="#ffffff"
-                android:orientation="horizontal">
-
-                <ImageView
-                    android:id="@+id/dialog_iv"
-                    android:layout_width="62dp"
-                    android:layout_height="62dp"
-                    android:layout_marginEnd="12dp"
-                    android:adjustViewBounds="true"
-                    android:contentDescription="@string/image_des"
-                    android:src="@mipmap/icon" />
-
-                <LinearLayout
-                    android:layout_width="match_parent"
-                    android:layout_height="match_parent"
-                    android:orientation="vertical">
-
-                    <TextView
-                        android:id="@+id/dialog_name_tv"
-                        android:layout_width="match_parent"
-                        android:layout_height="wrap_content"
-                        android:text="早起打卡，好习惯，高回报"
-                        android:textColor="#333333" />
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="2"/>
-                    <TextView
-                        style="@style/style_xian_jin"
-                        android:text="现金" />
-                    <View
-                        android:layout_width="match_parent"
-                        android:layout_height="0dp"
-                        android:layout_weight="1"/>
-                    <TextView
-                        android:id="@+id/dialog_amount_tv"
-                        android:layout_width="wrap_content"
-                        android:layout_height="wrap_content"
-                        android:text="+0.8元"
-                        android:textColor="#fffe5864"
-                        android:textSize="15sp" />
-                </LinearLayout>
-            </LinearLayout>
+                android:gravity="center"
+                android:text="+0.01"
+                android:textColor="#FE5864"
+                android:textSize="12sp" />
 
-            <LinearLayout
-                android:id="@+id/money_button_view"
+            <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_marginTop="20dp"
                 android:gravity="center"
-                android:visibility="gone"
-                android:orientation="horizontal">
-
-                <TextView
-                    android:id="@+id/dialog_btn_left"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginEnd="12dp"
-                    android:background="@drawable/shape_sign_green_but_bg"
-                    android:paddingLeft="20dp"
-                    android:paddingTop="5dp"
-                    android:paddingRight="20dp"
-                    android:paddingBottom="5dp"
-                    android:text="换一个"
-                    android:textColor="#ffffff"
-                    android:textSize="16sp" />
-
-                <TextView
-                    android:id="@+id/dialog_btn_right"
-                    android:layout_width="wrap_content"
-                    android:layout_height="wrap_content"
-                    android:layout_marginStart="12dp"
-                    android:background="@drawable/shape_sign_blue_but_bg"
-                    android:paddingLeft="20dp"
-                    android:paddingTop="5dp"
-                    android:paddingRight="20dp"
-                    android:paddingBottom="5dp"
-                    android:text="立即赚钱"
-                    android:textColor="#ffffffff"
-                    android:textSize="16sp" />
-            </LinearLayout>
+                android:text="元"
+                android:textColor="#ff1c9cf9"
+                android:textSize="12sp" />
         </LinearLayout>
-
-        <ImageView
-            android:id="@+id/dialog_close"
-            android:layout_width="40dp"
-            android:layout_height="40dp"
-            android:layout_below="@+id/dialog_center_ll"
+        <TextView
+            android:id="@+id/money_title_view"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="15dp"
             android:layout_centerHorizontal="true"
-            android:layout_marginTop="@dimen/content_padding_30"
-            android:src="@mipmap/close" />
+            android:layout_below="@+id/dialog_award_container"
+            android:text="今日赚钱推荐"
+            android:textColor="@android:color/white"
+            android:textSize="12sp" />
+        <ImageView
+            android:id="@+id/ad_iv"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="12dp"
+            android:layout_below="@+id/money_title_view"
+            android:adjustViewBounds="true"
+            android:maxHeight="150dp"
+            android:minHeight="100dp"
+            android:scaleType="center" />
+
     </RelativeLayout>
-</FrameLayout>
+    <ImageView
+        android:id="@+id/dialog_close"
+        android:layout_width="40dp"
+        android:layout_height="40dp"
+        android:layout_below="@+id/dialog_center_ll"
+        android:layout_centerHorizontal="true"
+        android:layout_marginTop="@dimen/content_padding_30"
+        android:src="@mipmap/close" />
+
+</RelativeLayout>

app/src/main/res/values/gamegroup_styles.xml

@@ -98,6 +98,8 @@
         <item name="android:windowNoTitle">true</item><!--无标题-->
         <item name="android:windowBackground">@android:color/transparent</item><!--背景透明-->
         <item name="android:backgroundDimAmount">0.7</item><!--透明度 0.0f到1.0f之间。1.0完全不透明，0.0f完全透明-->
+        <item name="listPreferredItemPaddingLeft">12dip</item>
+        <item name="listPreferredItemPaddingRight">12dip</item>
     </style>
     <style name="dialog_fullTranslucent" parent="@android:style/Theme.Dialog">
         <item name="android:windowFrame">@android:color/transparent</item><!--边框-->