代码优化

video/app/src/main/java/com/duben/dayplaylet/mvp/model/DrawInfoBean.java

+package com.duben.dayplaylet.mvp.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class DrawInfoBean implements Serializable {
+
+    private UserBean.UserMsgBean userMsg;
+
+    private List<DrawInfoItemBean> list;
+
+    private String cash;
+    private int hasCount;
+
+    public UserBean.UserMsgBean getUserMsg() {
+        return userMsg;
+    }
+
+    public void setUserMsg(UserBean.UserMsgBean userMsg) {
+        this.userMsg = userMsg;
+    }
+
+    public List<DrawInfoItemBean> getList() {
+        return list;
+    }
+
+    public void setList(List<DrawInfoItemBean> list) {
+        this.list = list;
+    }
+
+    public String getCash() {
+        return cash;
+    }
+
+    public void setCash(String cash) {
+        this.cash = cash;
+    }
+
+    public int getHasCount() {
+        return hasCount;
+    }
+
+    public void setHasCount(int hasCount) {
+        this.hasCount = hasCount;
+    }
+
+    public class DrawInfoItemBean implements Serializable {
+        private String unitId;//提现id
+        private String unitTag;//新人专享 左上角是否有tag ,null没有
+        private double cash;
+        /**
+         * 21 任务弹框，
+         * 11 直接在当前页面观看视频，-- 立即赚钱
+         * 12 跳转到别的地方赚钱，--前端 去赚钱
+         * 13 直接谈提示，用tip
+         * 1满足可以提现条件 可以判断是否白嫖视频了
+         */
+        private int status;
+
+        //任务类型相关信息
+        private int taskComplete;//最大
+        private int taskNeedComplete;
+        private boolean needSeeVedioBeforeCashout;//可以判断是否白嫖视频
+        private String tip;
+
+        public String getUnitId() {
+            return unitId;
+        }
+
+        public void setUnitId(String unitId) {
+            this.unitId = unitId;
+        }
+
+        public String getUnitTag() {
+            return unitTag;
+        }
+
+        public void setUnitTag(String unitTag) {
+            this.unitTag = unitTag;
+        }
+
+        public double getCash() {
+            return cash;
+        }
+
+        public void setCash(double cash) {
+            this.cash = cash;
+        }
+
+        public int getStatus() {
+            return status;
+        }
+
+        public void setStatus(int status) {
+            this.status = status;
+        }
+
+        public int getTaskComplete() {
+            return taskComplete;
+        }
+
+        public void setTaskComplete(int taskComplete) {
+            this.taskComplete = taskComplete;
+        }
+
+        public int getTaskNeedComplete() {
+            return taskNeedComplete;
+        }
+
+        public void setTaskNeedComplete(int taskNeedComplete) {
+            this.taskNeedComplete = taskNeedComplete;
+        }
+
+        public boolean isNeedSeeVedioBeforeCashout() {
+            return needSeeVedioBeforeCashout;
+        }
+
+        public void setNeedSeeVedioBeforeCashout(boolean needSeeVedioBeforeCashout) {
+            this.needSeeVedioBeforeCashout = needSeeVedioBeforeCashout;
+        }
+
+        public String getTip() {
+            return tip;
+        }
+
+        public void setTip(String tip) {
+            this.tip = tip;
+        }
+    }
+}

video/app/src/main/java/com/duben/dayplaylet/mvp/presenters/DrawCashPresenter.kt

 package com.duben.dayplaylet.mvp.presenters
 
+import com.duben.dayplaylet.manager.AppHttpManager
+import com.duben.dayplaylet.mvp.model.BaseResponse
+import com.duben.dayplaylet.mvp.model.DrawInfoBean
 import com.duben.dayplaylet.mvp.views.DrawCashView
+import com.duben.library.net.neterror.BaseSubscriber
+import com.duben.library.net.neterror.Throwable
 
 class DrawCashPresenter : BasePresenter<DrawCashView>() {
 
+    fun cashPageCoin() {
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.cashPageCoin(),
+                object : BaseSubscriber<BaseResponse<DrawInfoBean>>() {
+                    override fun onCompleted() {
+                        if (isLinkView) return
+                        view.hideLoading()
+                    }
+
+                    override fun onError(e: Throwable) {
+                        if (isLinkView) return
+                        view.hideLoading()
+                        view.showToast(e.message)
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<DrawInfoBean>) {
+                        if (isLinkView) return
+
+                        view.hideLoading()
+                        val code = baseResponse.status
+                        val message = baseResponse.message
+
+                        when (code) {
+                            200 -> view.getRedpkgSuc(baseResponse.data)
+                        }
+                    }
+                })
+    }
+
+    fun cashPageDi() {
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.cashPageDi(),
+                object : BaseSubscriber<BaseResponse<DrawInfoBean>>() {
+                    override fun onCompleted() {
+                        if (isLinkView) return
+                        view.hideLoading()
+                    }
+
+                    override fun onError(e: Throwable) {
+                        if (isLinkView) return
+                        view.hideLoading()
+                        view.showToast(e.message)
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<DrawInfoBean>) {
+                        if (isLinkView) return
+
+                        view.hideLoading()
+                        val code = baseResponse.status
+                        val message = baseResponse.message
+
+                        when (code) {
+                            200 -> view.getYuanbaoSuc(baseResponse.data)
+                        }
+                    }
+                })
+    }
 }
\ No newline at end of file

video/app/src/main/java/com/duben/dayplaylet/mvp/views/DrawCashView.kt

 package com.duben.dayplaylet.mvp.views
 
+import com.duben.dayplaylet.mvp.model.DrawInfoBean
+
 interface DrawCashView : BaseView {
+   fun getRedpkgSuc(data:DrawInfoBean)
+   fun getYuanbaoSuc(data:DrawInfoBean)
 }
\ No newline at end of file

video/app/src/main/java/com/duben/dayplaylet/net/LoanService.java

@@ -3,6 +3,7 @@ package com.duben.dayplaylet.net;
 import android.content.Context;
 import android.text.TextUtils;
 
+import com.duben.dayplaylet.mvp.model.DrawInfoBean;
 import com.duben.dayplaylet.mvp.model.SignInfoBean;
 import com.duben.dayplaylet.mvp.model.MusicBean;
 import com.duben.dayplaylet.mvp.model.TaskInfoBean;
@@ -246,6 +247,22 @@ public interface LoanService {
     @POST("api/reward/rdUserHallList")
     Observable<BaseResponse<TaskInfoBean>> rdUserHallList();
 
+    /**
+     * 红包券提现列表
+     *
+     * @return
+     */
+    @POST("api/cash/cashPage/coin")
+    Observable<BaseResponse<DrawInfoBean>> cashPageCoin();
+
+    /**
+     * 元宝提现列表
+     *
+     * @return
+     */
+    @POST("api/cash/cashPage/di")
+    Observable<BaseResponse<DrawInfoBean>> cashPageDi();
+
     /**
      * 默认http工厂
      */

video/app/src/main/java/com/duben/dayplaylet/ui/fragment/draw/DrawCashFragment.kt

@@ -5,6 +5,7 @@ import androidx.fragment.app.Fragment
 import androidx.recyclerview.widget.LinearLayoutManager
 import androidx.recyclerview.widget.RecyclerView
 import com.duben.dayplaylet.R
+import com.duben.dayplaylet.mvp.model.DrawInfoBean
 import com.duben.dayplaylet.mvp.presenters.DrawCashPresenter
 import com.duben.dayplaylet.mvp.views.DrawCashView
 import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
@@ -75,12 +76,28 @@ class DrawCashFragment : LazyLoadBaseFragment(), DrawCashView {
         }
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+
+        drawCashPresenter.detachView()
+    }
 
     override fun onFragmentResume() {
         if (drawType == DRAW_TYPE_CASH) {
             // 红包
+            drawCashPresenter.cashPageCoin()
         } else {
             // 元宝
+            drawCashPresenter.cashPageDi()
+
         }
     }
+
+    override fun getRedpkgSuc(data: DrawInfoBean) {
+
+    }
+
+    override fun getYuanbaoSuc(data: DrawInfoBean) {
+
+    }
 }
\ No newline at end of file

video/app/src/main/res/drawable/shape_task_btn.xml

@@ -3,6 +3,6 @@
     <corners android:radius="500dp" />
     <gradient
         android:angle="270"
-        android:endColor="#F13D3D"
-        android:startColor="#F13D3D" />
+        android:endColor="#FF3F22"
+        android:startColor="#FE816A" />
 </shape>
\ No newline at end of file

video/app/src/main/res/drawable/shape_task_btn_top.xml

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="500dp" />
+    <gradient
+        android:angle="270"
+        android:endColor="#FE6704"
+        android:startColor="#FFC123" />
+</shape>
\ No newline at end of file

video/app/src/main/res/layout/fragment_main_my.xml

@@ -281,7 +281,7 @@
                         android:layout_height="30dp"
                         android:layout_gravity="right|bottom"
                         android:layout_marginBottom="10dp"
-                        android:background="@drawable/shape_task_btn"
+                        android:background="@drawable/shape_task_btn_top"
                         android:gravity="center"
                         android:text="领金元宝"
                         android:textColor="@color/white"