[李俊岐] 修改福利页

app/src/main/java/com/ym/msdh/game/GameActivity.kt

@@ -159,17 +159,7 @@ class GameActivity : UnityPlayerActivity(), IDialogViewCloseCallback {
     fun onclickHead() {
 //        JumpUtils.jumpUserInfoActivity()
 
-//        GameDialog.showProduceGourmet(this@GameActivity,20,0,object :View.OnClickListener {
-//            override fun onClick(p0: View?) {
-//
-//            }
-//        },object :View.OnClickListener {
-//            override fun onClick(p0: View?) {
-//
-//            }
-//        })
-//
-        GameDialog.showGoldInadequate(this@GameActivity,object :View.OnClickListener {
+        GameDialog.showAccelerator(this@GameActivity,10,object :View.OnClickListener {
             override fun onClick(p0: View?) {
 
             }

app/src/main/java/com/ym/msdh/game/adapter/WelfareTaskAdpater.kt

@@ -51,11 +51,11 @@ class WelfareTaskAdpater :
             }
 
             if (data?.adRenderStyle != null && data?.adRenderStyle == 3) {
-                holder?.layoutBg.setBackgroundResource(R.drawable.shape_ffedf7_r8)
+                holder?.layoutBg.setBackgroundResource(R.drawable.icon_item_lucky_task_bg)
             } else if (data?.adRenderStyle != null && data?.adRenderStyle == 2) {
-                holder?.layoutBg.setBackgroundResource(R.drawable.shape_ffedf7_r8)
+                holder?.layoutBg.setBackgroundResource(R.drawable.icon_item_lucky_task_bg)
             } else {
-                holder?.layoutBg.setBackgroundResource(R.drawable.shape_fefce2_r8)
+                holder?.layoutBg.setBackgroundResource(R.drawable.icon_record_bg)
             }
 
             if (data?.buttonSway != null && data?.buttonSway == 1) {
@@ -86,7 +86,7 @@ class WelfareTaskAdpater :
             when (data.status) {
                 0 -> {
                     if (data?.adRenderStyle != null && data?.adRenderStyle == 3) {
-                        holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete2)
+                        holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete)
                     } else {
                         holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_complete)
                     }

app/src/main/res/drawable/game_welfare_progress_bg.xml

@@ -6,7 +6,7 @@
             <!--            <stroke-->
             <!--                android:width="1dp"-->
             <!--                android:color="#EEEEEE" />-->
-            <solid android:color="#975423" />
+            <solid android:color="#A45D00" />
         </shape>
     </item>
     <item android:id="@android:id/progress">
@@ -15,8 +15,8 @@
                 <corners android:radius="9dp" />
                 <gradient
                     android:angle="0"
-                    android:endColor="#FF5A44"
-                    android:startColor="#FF5A44" />
+                    android:endColor="#68CB00"
+                    android:startColor="#68CB00" />
             </shape>
         </clip>
     </item>

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

@@ -2,10 +2,10 @@
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
     android:id="@+id/layout_welfare_item_bg"
     android:layout_width="match_parent"
-    android:layout_height="66dp"
-    android:layout_marginBottom="12dp"
-    android:background="@drawable/shape_fefce2_r8"
-    android:paddingLeft="@dimen/dp_14">
+    android:layout_height="76dp"
+    android:layout_marginBottom="10dp"
+    android:background="@drawable/icon_record_bg"
+    android:paddingLeft="@dimen/dp_21">
 
     <LinearLayout
         android:layout_width="wrap_content"
@@ -24,8 +24,8 @@
                 android:layout_height="wrap_content"
                 android:includeFontPadding="false"
                 android:text="浇水10次"
-                android:textColor="@color/color_333333"
-                android:textSize="17sp" />
+                android:textColor="#663408"
+                android:textSize="16sp" />
 
             <ImageView
                 android:id="@+id/iv_welfare_item_title"
@@ -36,25 +36,22 @@
 
         </LinearLayout>
 
-
-        <TextView
+        <com.ym.library.widget.MediumBoldTextView
             android:id="@+id/tv_welfare_item_subtitle"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_below="@+id/tv_welfare_item_title"
             android:layout_marginTop="6dp"
             android:includeFontPadding="false"
             android:text="浏览60秒领取奖励"
             android:textColor="#975423"
-            android:textSize="13sp" />
+            android:textSize="14sp" />
     </LinearLayout>
 
     <LinearLayout
-
         android:layout_width="wrap_content"
         android:layout_height="match_parent"
         android:layout_alignParentRight="true"
-        android:layout_marginRight="14dp"
+        android:layout_marginRight="21dp"
         android:gravity="center_vertical|center_horizontal"
         android:orientation="vertical">
 
@@ -72,21 +69,20 @@
                 android:layout_marginRight="@dimen/dp_3"
                 android:src="@drawable/icon_welfare_diamond" />
 
-            <TextView
+            <com.ym.library.widget.MediumBoldTextView
                 android:id="@+id/tv_welfare_item_count"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:text="+0g"
+                android:text="+0"
                 android:textColor="#FF5A44"
-                android:textSize="15sp"
-                android:textStyle="bold" />
+                android:textSize="15sp" />
         </LinearLayout>
 
         <RelativeLayout
             android:id="@+id/layout_welfare_item_status"
-            android:layout_width="86dp"
-            android:layout_height="34dp"
-            android:layout_marginTop="3dp">
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_marginTop="-6dp">
 
             <ImageView
                 android:id="@+id/iv_welfare_item_status"
@@ -95,6 +91,7 @@
                 android:src="@drawable/icon_item_welfare_task_receiveed" />
 
             <TextView
+                android:visibility="gone"
                 android:id="@+id/tv_welfare_item_status"
                 android:layout_width="match_parent"
                 android:layout_height="30dp"

library/src/main/java/com/ym/library/utils/GameDialog.kt

@@ -548,7 +548,7 @@ object GameDialog : BaseDialog() {
     /**
      * 加速器
      */
-    fun showAccelerator(activity: Activity,sum:Int,listener: View.OnClickListener) {
+    fun showAccelerator(activity: Activity,num:Int,listener: View.OnClickListener) {
         if (activity == null) return
         val mDialog = Dialog(activity, R.style.UpdateVersionCompatDialogTheme)
         val mDialogView =
@@ -561,25 +561,27 @@ object GameDialog : BaseDialog() {
             )
 
         val layout_dialog_root =
-            mDialogView.findViewById<LinearLayout>(R.id.layout_gold_root)
-        val btn_gold_btn = mDialogView.findViewById<ImageView>(R.id.btn_gold_btn)
-        val iv_diamoind_close = mDialogView.findViewById<ImageView>(R.id.iv_gold_close)
+            mDialogView.findViewById<LinearLayout>(R.id.layout_accelerator_root)
+        val btn_accelerator_btn = mDialogView.findViewById<ImageView>(R.id.btn_accelerator_btn)
+        val tv_accelerator_num = mDialogView.findViewById<TextView>(R.id.tv_accelerator_num)
+        val iv_accelerator_close = mDialogView.findViewById<ImageView>(R.id.iv_accelerator_close)
         val layout_ad = mDialogView?.findViewById<FrameLayout>(R.id.layout_ad)
 
+        tv_accelerator_num.text = "今天剩余${num}次"
 
-        btn_gold_btn.setOnClickListener {
+        btn_accelerator_btn.setOnClickListener {
             mDialog?.dismiss()
         }
 
-        iv_diamoind_close.setOnClickListener {
+        iv_accelerator_close.setOnClickListener {
             mDialog?.dismiss()
         }
 
         mDialog?.setOnDismissListener {
-            listener.onClick(btn_gold_btn)
+            listener.onClick(btn_accelerator_btn)
         }
 
-        FilterUtils.addClickAlpha(btn_gold_btn)
+        FilterUtils.addClickAlpha(btn_accelerator_btn)
 
         mDialog.setCanceledOnTouchOutside(false)
         mDialog.setCancelable(false)

library/src/main/res/layout/dialog_layout_accelerator.xml

 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/layout_get_box_root"
+    android:id="@+id/layout_accelerator_root"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
     android:gravity="center"
@@ -31,34 +31,33 @@
             <ImageView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_below="@+id/tv_get_box_info"
                 android:layout_centerHorizontal="true"
                 android:layout_marginTop="80dp"
-                android:src="@drawable/icon_coin" />
+                android:src="@drawable/icon_accelerator_bg" />
 
             <ImageView
-                android:id="@+id/btn_get_box_btn"
+                android:id="@+id/btn_accelerator_btn"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:layout_above="@+id/tv_get_box_num"
+                android:layout_above="@+id/tv_accelerator_num"
                 android:layout_centerHorizontal="true"
-                android:src="@drawable/icon_ad_open_box_btn" />
+                android:src="@drawable/icon_accelerator_bg_btn" />
 
             <TextView
-                android:id="@+id/tv_get_box_num"
+                android:id="@+id/tv_accelerator_num"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_alignParentBottom="true"
                 android:layout_centerHorizontal="true"
-                android:layout_marginBottom="30dp"
-                android:text="今天剩余15次"
+                android:layout_marginBottom="34dp"
+                android:text="今天剩余x次"
                 android:textColor="#94491A"
-                android:textSize="13sp" />
+                android:textSize="14sp" />
 
         </RelativeLayout>
 
         <ImageView
-            android:id="@+id/iv_get_box_close"
+            android:id="@+id/iv_accelerator_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="right"