收支明细中添加兑换按钮

app/src/main/java/com/sheep/gamegroup/model/entity/ILog.java

@@ -10,6 +10,8 @@ public interface ILog {
 
     String getEventText();
 
+    String getEventBtnText();
+
     boolean isEventSuccess();
 
     long getEventTime();

app/src/main/java/com/sheep/gamegroup/model/entity/RechargeBalanceLog.java

@@ -106,6 +106,11 @@ public class RechargeBalanceLog implements ILog{
     }
 
     @Override
+    public String getEventBtnText() {
+        return null;
+    }
+
+    @Override
     public boolean isEventSuccess() {
         return true;
     }

app/src/main/java/com/sheep/gamegroup/model/entity/RechargeLog.java

@@ -37,6 +37,19 @@ public class RechargeLog implements ILog {
 
     private String wx_account;//string微信账
     private boolean isSelect;
+    private int exchange_status;//integer ($int64) 兑换状态 0:不需兑换,1:未完成 2:待处理(显示兑换按钮) 3:处理中(显示查看按钮) 4:已完成(显示查看按钮)
+    public static final int STATUS_NOT = 0;
+    public static final int STATUS_NOT_FINISHED = 1;
+    public static final int STATUS_CAN_EXCHANGE = 2;
+    public static final int STATUS_HANDLING = 3;
+    public static final int STATUS_FINISHED = 4;
+    public void setExchange_status(int exchange_status) {
+        this.exchange_status = exchange_status;
+    }
+
+    public int getExchange_status() {
+        return exchange_status;
+    }
 
     public boolean isSelect() {
         return isSelect;
@@ -168,6 +181,22 @@ public class RechargeLog implements ILog {
         return detail_desc;
     }
 
+
+    @Override
+    public String getEventBtnText() {
+        switch (exchange_status){
+            case STATUS_NOT:
+            case STATUS_NOT_FINISHED:
+            default:
+                return null;
+            case STATUS_CAN_EXCHANGE:
+                return "兑换";
+            case STATUS_HANDLING:
+            case STATUS_FINISHED:
+                return "查看";
+        }
+    }
+
     @Override
     public boolean isEventSuccess() {
         return type== 1;

app/src/main/java/com/sheep/gamegroup/model/entity/RechargeQQLog.java

@@ -124,6 +124,11 @@ public class RechargeQQLog implements ILog{
     }
 
     @Override
+    public String getEventBtnText() {
+        return null;
+    }
+
+    @Override
     public boolean isEventSuccess() {
         return status == 2;
     }

app/src/main/java/com/sheep/gamegroup/model/entity/WithdrawalEty.java

@@ -171,6 +171,11 @@ public class WithdrawalEty implements ILog{
     }
 
     @Override
+    public String getEventBtnText() {
+        return null;
+    }
+
+    @Override
     public boolean isEventSuccess() {
         return pay_status == 2;
     }

app/src/main/java/com/sheep/gamegroup/module/personal/adapter/AdpILog.java

@@ -1,6 +1,7 @@
 package com.sheep.gamegroup.module.personal.adapter;
 
 import android.support.annotation.Nullable;
+import android.text.TextUtils;
 import android.view.View;
 import android.widget.ImageView;
 import android.widget.TextView;
@@ -10,11 +11,14 @@ import com.chad.library.adapter.base.BaseViewHolder;
 import com.sheep.gamegroup.model.entity.ILog;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.util.TimeUtil;
+import com.sheep.gamegroup.util.ViewUtil;
 import com.sheep.jiuyan.samllsheep.R;
 import com.sheep.jiuyan.samllsheep.SheepApp;
 
 import java.util.List;
 
+import rx.functions.Action1;
+
 /**
  * Created by realicing on 2018/12/21.
  * realicing@sina.com
@@ -25,6 +29,13 @@ public class AdpILog extends BaseQuickAdapter<ILog, BaseViewHolder> {
         super(R.layout.x_my_money_act_layout_item, data);
     }
 
+    private Action1<ILog> callBack;
+
+    public AdpILog setCallBack(Action1<ILog> callBack) {
+        this.callBack = callBack;
+        return this;
+    }
+
     @Override
     protected void convert(BaseViewHolder helper, ILog item) {
         View convertView = helper.itemView;
@@ -33,6 +44,17 @@ public class AdpILog extends BaseQuickAdapter<ILog, BaseViewHolder> {
         View my_money_item_top = convertView.findViewById(R.id.my_money_item_top);
         View my_money_item_center = convertView.findViewById(R.id.my_money_item_center);
         View my_money_item_bottom = convertView.findViewById(R.id.my_money_item_bottom);
+        TextView btn_exchange_tv = convertView.findViewById(R.id.btn_exchange_tv);
+
+        //显示按钮
+        ViewUtil.setText(btn_exchange_tv, item.getEventBtnText());
+        ViewUtil.setVisibility(btn_exchange_tv, !TextUtils.isEmpty(item.getEventBtnText()));
+        btn_exchange_tv.setOnClickListener(view -> {
+            if(callBack != null){
+                callBack.call(item);
+            }
+        });
+
         final TextView my_money_item_recharge_amount = convertView.findViewById(R.id.my_money_item_recharge_amount);
         TextView my_money_item_recharge_status = convertView.findViewById(R.id.my_money_item_recharge_status);
         TextView my_money_item_recharge_time = convertView.findViewById(R.id.my_money_item_recharge_time);

app/src/main/java/com/sheep/gamegroup/module/personal/fragment/FgtRechargeLog.java

@@ -7,6 +7,7 @@ import com.sheep.gamegroup.model.entity.BaseMessage;
 import com.sheep.gamegroup.model.entity.ILog;
 import com.sheep.gamegroup.model.entity.RechargeLog;
 import com.sheep.gamegroup.module.personal.adapter.AdpILog;
+import com.sheep.gamegroup.util.Jump2View;
 import com.sheep.gamegroup.util.ListUtil;
 import com.sheep.gamegroup.view.fragment.BaseListFragment3;
 
@@ -16,9 +17,10 @@ import java.util.ArrayList;
 import java.util.List;
 
 import io.reactivex.Observable;
+import rx.functions.Action1;
 
 /**
- * 我的资产 --> 收费明细
+ * 我的资产 --> 收支明细
  * Created by realicing on 2018/12/21.
  * realicing@sina.com
  */
@@ -33,7 +35,7 @@ public class FgtRechargeLog extends BaseListFragment3<RechargeLog> {
 
     @Override
     protected RecyclerView.Adapter getAdapter() {
-        return new AdpILog(logList);
+        return new AdpILog(logList).setCallBack(item -> Jump2View.getInstance().goAppointTaskList());
     }
 
     @Override

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

@@ -43,6 +43,19 @@
                 android:src="@mipmap/myprice_on"
                 android:layout_marginLeft="@dimen/content_padding_1"
                 android:visibility="invisible"/>
+            <TextView
+                android:id="@+id/btn_exchange_tv"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_marginStart="6dp"
+                android:paddingTop="3dp"
+                android:paddingBottom="3dp"
+                android:paddingStart="6dp"
+                android:paddingEnd="6dp"
+                android:textColor="@android:color/white"
+                android:textSize="10sp"
+                android:text="兑换"
+                android:background="@drawable/selector_button_full_main"/>
         </LinearLayout>
 
         <TextView