[李俊岐] 优化提现列表

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

@@ -15,7 +15,7 @@
             android:layout_height="360dp"
             android:layout_marginTop="6dp"
             android:layout_marginRight="5dp"
-            android:background="@drawable/icon_base_dialog_bg">
+            android:background="@drawable/icon_base_dialog_bg_360">
 
             <com.ym.library.widget.FontTextView
                 android:layout_width="wrap_content"

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

@@ -650,15 +650,21 @@ object GameDialog : BaseDialog() {
         tvcashcontent.text = result?.reason
 
         id_img_dialog_close?.setOnClickListener {
-            mDialog?.dismiss()
+            mDialog.dismiss()
         }
 
         btm_wihdraw_status?.setOnClickListener {
+            if (result?.buttonStatus == 0) {
+            } else if (result?.buttonStatus == 1) {
+                JumpUtils.jumpWelfareActivity()
+            } else if (result?.buttonStatus == 2) {
+                activity?.finish()
+            }
             mDialog?.dismiss()
         }
 
         when (result?.status) {
-            1, 5, 6 -> {
+            1, 2, 5, 6 -> {
                 btm_wihdraw_status.setImageResource(R.drawable.icon_dialog_zuanqian)
                 if (result?.status == 1) {
                     when (result?.type) {
@@ -680,7 +686,7 @@ object GameDialog : BaseDialog() {
                     }
                 }
             }
-            2, 4 -> {
+            4 -> {
                 btm_wihdraw_status.setImageResource(R.drawable.icon_dialog_lingzhuanshi)
             }
             3 -> {

userinfo/src/main/java/com/ym/userinfo/module/adapter/WithdrawAdapter.kt

 package com.ym.userinfo.module.adapter
 
 import android.content.Context
+import android.graphics.Color
 import android.view.LayoutInflater
 import android.view.View
 import android.view.ViewGroup
@@ -56,9 +57,12 @@ class WithdrawAdapter :
                 holder.ivNewerOnly.visibility = View.GONE
             }*/
             if (data.ifUse == 1) {
-                holder.ivNewerOnly.visibility = View.GONE
+                holder.ivNewerOnly.visibility = View.VISIBLE
 //                holder.ivAlreadyCashed.visibility = View.VISIBLE
-                holder.layoutRoot.setBackgroundResource(R.drawable.icon_item_yitixian)
+                holder.ivNewerOnly.setImageResource(R.drawable.icon_item_yitixian)
+//                holder.ivAlreadyCashed.visibility = View.VISIBLE
+                holder.layoutRoot.setBackgroundResource(R.drawable.icon_user_tip_already_cashed)
+                holder.tvText.setTextColor(Color.parseColor("#999999"))
             } else {
                 // type "1 新人提现 2 打卡提现  3大额提现  4 福利专享 5 订单提现"
                 if (data.type == 3) {
@@ -74,16 +78,16 @@ class WithdrawAdapter :
                     }
                 }
 
+                if (position == mSelectPosition) {
+                    holder.layoutRoot.setBackgroundResource(R.drawable.icon_fragment_withdraw_selected)
+                } else {
+                    holder.layoutRoot.setBackgroundResource(R.drawable.icon_fragment_withdraw_select)
+                }
+
             }
         }
 
-        if (position == mSelectPosition) {
-//                    holder.ivSelectedImg.visibility = View.VISIBLE
-            holder.layoutRoot.setBackgroundResource(R.drawable.icon_fragment_withdraw_selected)
-        } else {
-            holder.layoutRoot.setBackgroundResource(R.drawable.icon_fragment_withdraw_select)
-//                    holder.ivSelectedImg.visibility = View.GONE
-        }
+
 
         holder.itemView.setOnClickListener {
             listener?.onItemClick(it, position, mList[position])