添加广告，界面开发

video/app/src/main/java/com/duben/dayplaylet/ad/video/InMoneyVideo.java

@@ -215,6 +215,9 @@ public class InMoneyVideo {
             HashMap<String, Object> vo = new HashMap<>();
             vo.put("carrierType", carrierType);
             vo.put("ecpmId", AppConfig.gromoreId);
+            if (AppConfig.taskListId != -1) {
+                vo.put("list_id", AppConfig.taskListId);
+            }
             TrackManager.getInstance().reportAddCoinMsg(vo);
             if (adStatusListener != null) {
                 adStatusListener.adClose(vo);

video/app/src/main/java/com/duben/dayplaylet/common/AppConfig.java

@@ -13,6 +13,7 @@ public class AppConfig {
     public static int awardRedpkg = 0;
     public static int awardYuanbao = 0;
     public static int csjAdRate = 100;
+    public static int taskListId = -1;
 
     public static double signCash1 = 0.0;
     public static double signCash2 = 0.0;

video/app/src/main/java/com/duben/dayplaylet/common/Constant.kt

@@ -44,6 +44,8 @@ object Constant {
     const val GRO_MORE_ADTYPE6 = "6"
 
     // 协议地址
+    var DRAWRULE_URL = "http://mints-web.mints-id.com/agreements/dayplaylet/txgz.html"//提现规则
+    var INCOME_URL = "http://mints-web.mints-id.com/agreements/dayplaylet/sysm.html"//收益说明
     var REGISTER_URL = "http://mints-web.mints-id.com/agreements/dayplaylet/yhxy.html"//注册协议
     var PRIVACY_URL = "http://mints-web.mints-id.com/agreements/dayplaylet/syzc.html"//隐私协议
     var MEMBERS_URL = "https://mints-web.mints-id.com/agreements/dayplaylet/gmxy.html"//会员付费服务协议

video/app/src/main/java/com/duben/dayplaylet/manager/UserManager.java

@@ -72,11 +72,11 @@ public class UserManager {
     /**
      * 保存用户信息
      */
-    public void saveUserInfo(UserBean user) {
+    public void saveUserInfo(UserBean data) {
         if (ps == null) {
             return;
         }
-
+        UserBean.UserMsgBean user = data.getUserMsg();
         String token = user.getToken();
 
         if (token != null) {

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

+package com.duben.dayplaylet.mvp.model;
+
+import java.io.Serializable;
+import java.util.List;
+
+public class TaskInfoBean implements Serializable {
+
+    private DiMsgBean diMsg;
+
+    private List<TaskItemBean> list;
+
+    public DiMsgBean getDiMsg() {
+        return diMsg;
+    }
+
+    public void setDiMsg(DiMsgBean diMsg) {
+        this.diMsg = diMsg;
+    }
+
+    public List<TaskItemBean> getList() {
+        return list;
+    }
+
+    public void setList(List<TaskItemBean> list) {
+        this.list = list;
+    }
+
+    public class DiMsgBean implements Serializable {
+        private int max;// 最大
+        private int complete;//已完成
+
+        public int getMax() {
+            return max;
+        }
+
+        public void setMax(int max) {
+            this.max = max;
+        }
+
+        public int getComplete() {
+            return complete;
+        }
+
+        public void setComplete(int complete) {
+            this.complete = complete;
+        }
+    }
+
+    public class TaskItemBean implements Serializable {
+
+        private TaskBaseBean base;
+
+        public TaskBaseBean getBase() {
+            return base;
+        }
+
+        public void setBase(TaskBaseBean base) {
+            this.base = base;
+        }
+
+        public class TaskBaseBean implements Serializable {
+            private int rewardCoin;//只领取
+            private int moreDi;//更多元宝
+            private int moreCoin;//更多红包
+            private boolean rewardMoreDiShowTip;// 元宝加最多
+            private boolean rewardMoreCoinShowTip;// 红包夹最多
+            private int list_id;
+            private String showMax;// 展示用的最大领取红包数
+            private int max;
+            private int rewardStatus;//状态 0未完成，1 待领取 2 已领取
+            private int complete;// 完成数
+            private String rewardMoreCarrier;//完成奖励点击领取时候后全拿下的carrierType
+            private String rewardCarrier;//完成奖励点击领取的carrierType
+            private String title;
+            private String content;//内容，#需要替换showMax变红
+
+            public int getRewardCoin() {
+                return rewardCoin;
+            }
+
+            public void setRewardCoin(int rewardCoin) {
+                this.rewardCoin = rewardCoin;
+            }
+
+            public int getMoreDi() {
+                return moreDi;
+            }
+
+            public void setMoreDi(int moreDi) {
+                this.moreDi = moreDi;
+            }
+
+            public int getMoreCoin() {
+                return moreCoin;
+            }
+
+            public void setMoreCoin(int moreCoin) {
+                this.moreCoin = moreCoin;
+            }
+
+            public boolean isRewardMoreDiShowTip() {
+                return rewardMoreDiShowTip;
+            }
+
+            public void setRewardMoreDiShowTip(boolean rewardMoreDiShowTip) {
+                this.rewardMoreDiShowTip = rewardMoreDiShowTip;
+            }
+
+            public boolean isRewardMoreCoinShowTip() {
+                return rewardMoreCoinShowTip;
+            }
+
+            public void setRewardMoreCoinShowTip(boolean rewardMoreCoinShowTip) {
+                this.rewardMoreCoinShowTip = rewardMoreCoinShowTip;
+            }
+
+            public int getList_id() {
+                return list_id;
+            }
+
+            public void setList_id(int list_id) {
+                this.list_id = list_id;
+            }
+
+            public String getShowMax() {
+                return showMax;
+            }
+
+            public void setShowMax(String showMax) {
+                this.showMax = showMax;
+            }
+
+            public int getMax() {
+                return max;
+            }
+
+            public void setMax(int max) {
+                this.max = max;
+            }
+
+            public int getRewardStatus() {
+                return rewardStatus;
+            }
+
+            public void setRewardStatus(int rewardStatus) {
+                this.rewardStatus = rewardStatus;
+            }
+
+            public int getComplete() {
+                return complete;
+            }
+
+            public void setComplete(int complete) {
+                this.complete = complete;
+            }
+
+            public String getRewardMoreCarrier() {
+                return rewardMoreCarrier;
+            }
+
+            public void setRewardMoreCarrier(String rewardMoreCarrier) {
+                this.rewardMoreCarrier = rewardMoreCarrier;
+            }
+
+            public String getRewardCarrier() {
+                return rewardCarrier;
+            }
+
+            public void setRewardCarrier(String rewardCarrier) {
+                this.rewardCarrier = rewardCarrier;
+            }
+
+            public String getTitle() {
+                return title;
+            }
+
+            public void setTitle(String title) {
+                this.title = title;
+            }
+
+            public String getContent() {
+                return content;
+            }
+
+            public void setContent(String content) {
+                this.content = content;
+            }
+        }
+    }
+}

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

@@ -9,115 +9,127 @@ import java.io.Serializable;
  */
 public class UserBean implements Serializable {
 
-    private String token;
-    private String nickName;
-    private String mobile;
-    private String idcode;
-    private String head;
-    private String openid;
-    private long pk_id;// 用户id
-
-    private int diamonds;
-    private int coin;
-    private int rewardFirst;//是否弹出过领取奖励的框，0 没有， 1弹过了
-    private int rewardCoin;//领取奖励的金币
-    private boolean alipaySet;//支付宝授权状态
-
-    public String getToken() {
-        return token;
-    }
+    private UserMsgBean userMsg;
 
-    public String getNickName() {
-        return nickName;
+    public UserMsgBean getUserMsg() {
+        return userMsg;
     }
 
-    public void setNickName(String nickName) {
-        this.nickName = nickName;
+    public void setUserMsg(UserMsgBean userMsg) {
+        this.userMsg = userMsg;
     }
 
-    public String getMobile() {
-        return mobile;
-    }
+    public class UserMsgBean implements Serializable {
+        private String token;
+        private String nickName;
+        private String mobile;
+        private String idcode;
+        private String head;
+        private String openid;
+        private long pk_id;// 用户id
 
-    public String getOpenid() {
-        return openid;
-    }
+        private int diamonds;
+        private int coin;
+        private int rewardFirst;//是否弹出过领取奖励的框，0 没有， 1弹过了
+        private int rewardCoin;//领取奖励的金币
+        private boolean alipaySet;//支付宝授权状态
 
-    public void setMobile(String mobile) {
-        this.mobile = mobile;
-    }
+        public String getToken() {
+            return token;
+        }
 
+        public String getNickName() {
+            return nickName;
+        }
 
-    public long getPk_id() {
-        return pk_id;
-    }
+        public void setNickName(String nickName) {
+            this.nickName = nickName;
+        }
 
-    public void setPk_id(long pk_id) {
-        this.pk_id = pk_id;
-    }
+        public String getMobile() {
+            return mobile;
+        }
 
+        public String getOpenid() {
+            return openid;
+        }
 
-    public String getIdcode() {
-        return idcode;
-    }
+        public void setMobile(String mobile) {
+            this.mobile = mobile;
+        }
 
-    public void setIdcode(String idcode) {
-        this.idcode = idcode;
-    }
 
-    public String getHead() {
-        return head;
-    }
+        public long getPk_id() {
+            return pk_id;
+        }
 
-    public void setHead(String head) {
-        this.head = head;
-    }
+        public void setPk_id(long pk_id) {
+            this.pk_id = pk_id;
+        }
 
-    public void setToken(String token) {
-        this.token = token;
-    }
 
-    public void setOpenid(String openid) {
-        this.openid = openid;
-    }
+        public String getIdcode() {
+            return idcode;
+        }
 
-    public int getDiamonds() {
-        return diamonds;
-    }
+        public void setIdcode(String idcode) {
+            this.idcode = idcode;
+        }
 
-    public void setDiamonds(int diamonds) {
-        this.diamonds = diamonds;
-    }
+        public String getHead() {
+            return head;
+        }
 
-    public int getCoin() {
-        return coin;
-    }
+        public void setHead(String head) {
+            this.head = head;
+        }
 
-    public void setCoin(int coin) {
-        this.coin = coin;
-    }
+        public void setToken(String token) {
+            this.token = token;
+        }
 
-    public int getRewardFirst() {
-        return rewardFirst;
-    }
+        public void setOpenid(String openid) {
+            this.openid = openid;
+        }
 
-    public void setRewardFirst(int rewardFirst) {
-        this.rewardFirst = rewardFirst;
-    }
+        public int getDiamonds() {
+            return diamonds;
+        }
 
-    public int getRewardCoin() {
-        return rewardCoin;
-    }
+        public void setDiamonds(int diamonds) {
+            this.diamonds = diamonds;
+        }
 
-    public void setRewardCoin(int rewardCoin) {
-        this.rewardCoin = rewardCoin;
-    }
+        public int getCoin() {
+            return coin;
+        }
 
-    public boolean isAlipaySet() {
-        return alipaySet;
-    }
+        public void setCoin(int coin) {
+            this.coin = coin;
+        }
+
+        public int getRewardFirst() {
+            return rewardFirst;
+        }
+
+        public void setRewardFirst(int rewardFirst) {
+            this.rewardFirst = rewardFirst;
+        }
+
+        public int getRewardCoin() {
+            return rewardCoin;
+        }
+
+        public void setRewardCoin(int rewardCoin) {
+            this.rewardCoin = rewardCoin;
+        }
+
+        public boolean isAlipaySet() {
+            return alipaySet;
+        }
 
-    public void setAlipaySet(boolean alipaySet) {
-        this.alipaySet = alipaySet;
+        public void setAlipaySet(boolean alipaySet) {
+            this.alipaySet = alipaySet;
+        }
     }
 }

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

@@ -58,6 +58,7 @@ class MyPresenter : BasePresenter<MyView>() {
                             200 -> if (data != null) {
                                 UserManager.getInstance().saveUserInfo(data)
                                 getMyInfo()
+                                rdUserHallList()
                             }
                             else -> view.showToast(message)
                         }
@@ -101,4 +102,40 @@ class MyPresenter : BasePresenter<MyView>() {
                     }
                 })
     }
+
+
+    fun rdUserHallList() {
+        AppHttpManager.getInstance(loanApplication)
+            .call(loanService.rdUserHallList(),
+                object : BaseSubscriber<BaseResponse<TaskInfoBean>>() {
+
+                    override fun onCompleted() {
+                        if (isLinkView)
+                            return
+
+                        view.hideLoading()
+                    }
+
+                    override fun onError(e: Throwable?) {
+                        if (isLinkView) return
+
+                        view.hideLoading()
+                    }
+
+                    override fun onNext(baseResponse: BaseResponse<TaskInfoBean>) {
+                        if (isLinkView) return
+
+                        val code: Int = baseResponse.status
+                        val message: String = baseResponse.message
+                        when (code) {
+                            200 -> {
+                                view.getHallListSuc(baseResponse.data)
+                            }
+                            else -> {
+                                view.showToast(message)
+                            }
+                        }
+                    }
+                })
+    }
 }
\ No newline at end of file

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

@@ -292,6 +292,7 @@ public class TrackPresenter extends BaseTrackPresenter {
                                     if (baseResponse.getStatus() == 200) {
                                         JsonObject data = baseResponse.getData();
                                         if (data != null) {
+                                            AppConfig.taskListId = -1;
                                             AppConfig.awardRedpkg = data.get("coin").getAsInt();
                                             AppConfig.awardYuanbao = data.get("di").getAsInt();
                                         }

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

 package com.duben.dayplaylet.mvp.views
 
+import com.duben.dayplaylet.mvp.model.TaskInfoBean
 import com.duben.dayplaylet.mvp.model.UserBean
 
 interface MyView : BaseView {
     fun getUserSuc(data:UserBean)
+    fun getHallListSuc(data: TaskInfoBean)
 }

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

@@ -5,6 +5,7 @@ import android.text.TextUtils;
 
 import com.duben.dayplaylet.mvp.model.SignInfoBean;
 import com.duben.dayplaylet.mvp.model.MusicBean;
+import com.duben.dayplaylet.mvp.model.TaskInfoBean;
 import com.google.gson.JsonObject;
 import com.duben.dayplaylet.BuildConfig;
 import com.duben.dayplaylet.mvp.model.BannerList;
@@ -128,7 +129,7 @@ public interface LoanService {
      *
      * @return
      */
-    @POST("api/vedio/topTabs/v0821")
+    @POST("api/vedio/topTabs")
     Observable<BaseResponse<BannerList>> topTabs();
 
     /**
@@ -243,6 +244,14 @@ public interface LoanService {
     @POST("api/reward/rdVedioMsg")
     Observable<BaseResponse<JsonObject>> rdVedioMsg();
 
+    /**
+     * 任务列表
+     *
+     * @return
+     */
+    @POST("api/reward/rdUserHallList")
+    Observable<BaseResponse<TaskInfoBean>> rdUserHallList();
+
     /**
      * 默认http工厂
      */

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

@@ -97,8 +97,7 @@ public class OkHttpInterceptor implements Interceptor {
         return request.newBuilder().
                 addHeader("version", DeviceInfo.Companion.getInstance().getVersionName()).
                 addHeader("token", tokenID).
-//                addHeader("pkgName", Constant.MINTS_PKG_NAME).
-                addHeader("pkgName", "com.mints.helivideo").
+                addHeader("pkgName", Constant.MINTS_PKG_NAME).
                 addHeader("channel", channel).
                 addHeader("new-session", MD5.GetMD5Code(String.valueOf(time))).
                 addHeader("last-session", Base64.encode(String.valueOf(time).getBytes("UTF-8"))).

video/app/src/main/java/com/duben/dayplaylet/ui/activitys/TaskAwardActivity.kt

@@ -4,6 +4,9 @@ import android.os.Bundle
 import android.view.KeyEvent
 import android.view.View
 import com.duben.dayplaylet.R
+import com.duben.dayplaylet.ad.AdManager
+import com.duben.dayplaylet.ad.AdStatusListener
+import com.duben.dayplaylet.ad.NoPreAdManager
 import com.duben.dayplaylet.ui.activitys.base.BaseActivity
 import com.duben.library.utils.nodoubleclick.AntiShake
 
@@ -14,13 +17,23 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
 
     companion object {
         const val REDPACKET = "REDPACKET"
-        const val YUANBAO = "YUANBAO"
+        const val MORE_REDPACKET = "MORE_REDPACKET"
+        const val MORE_YUANBAO = "MORE_YUANBAO"
+        const val FLAG_REDPACKET = "FLAG_REDPACKET"
+        const val FLAG_YUANBAO = "FLAG_YUANBAO"
         const val CARRIERTYPE = "CARRIERTYPE"
+        const val CARRIERTYPE_ALL = "CARRIERTYPE_ALL"
+        const val LIST_ID = "LIST_ID"
     }
 
-    private var redPacket = 0.0
-    private var yuanbao = 0
+    private var redPacketMore = 0
+    private var yuanbaoMore = 0
+    private var redPacket = 0
+    private var listId = -1
     private var carrierType = ""
+    private var carrierTypeAll = ""
+    private var redPacketFlag = false
+    private var yuanbaoFlag = false
 
     override fun getContentViewLayoutID() = R.layout.activity_task_award
 
@@ -33,9 +46,14 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
     override fun getBundleExtras(extras: Bundle?) {
         super.getBundleExtras(extras)
         extras?.let {
-            redPacket = it.getDouble(REDPACKET, 0.0)
-            yuanbao = it.getInt(YUANBAO, 0)
-            carrierType = it.getString(carrierType, "")
+            redPacket = it.getInt(REDPACKET, 0)
+            yuanbaoMore = it.getInt(MORE_YUANBAO, 0)
+            redPacketMore = it.getInt(MORE_REDPACKET, 0)
+            redPacketFlag = it.getBoolean(FLAG_REDPACKET, false)
+            yuanbaoFlag = it.getBoolean(FLAG_YUANBAO, false)
+            listId = it.getInt(LIST_ID, -1)
+            carrierType = it.getString(CARRIERTYPE, "")
+            carrierTypeAll = it.getString(CARRIERTYPE_ALL, "")
         }
     }
 
@@ -81,6 +99,54 @@ class TaskAwardActivity : BaseActivity(), View.OnClickListener {
         when (v.id) {
 //            R.id.tv_nine_know_next -> {
 //                finish()
+//            }
+        }
+    }
+
+    private fun showAd(carrierType: String) {
+        AdManager.instance.showAd(this@TaskAwardActivity, carrierType,
+            object : AdStatusListener {
+                var canFail = false
+                override fun adSuccess() {
+                    canFail = true
+                }
+
+                override fun adFail() {
+                    if (canFail) return
+
+                    showLoading("正在获取视频", false)
+                    NoPreAdManager.loadVideoAd(
+                        this@TaskAwardActivity,
+                        carrierType, object : AdStatusListener {
+                            override fun adFail() {
+                                hideLoading()
+                                showToast("广告太火爆了，请稍候再试")
+                            }
+
+                            override fun adSuccess() {
+                                hideLoading()
+                            }
+
+                            override fun adClose(vo: HashMap<String, Any>?) {
+                                hideLoading()
+                                adCloseNext(carrierType)
+                            }
+                        })
+                }
+
+                override fun adClose(vo: HashMap<String, Any>?) {
+                    adCloseNext(carrierType)
+                }
+            })
+    }
+
+    /**
+     * 点击关闭广告
+     */
+    private fun adCloseNext(carrierType: String) {
+        when (carrierType) {
+//            Constant.CARRIERTYPE_REWARD_FIRST -> {
+//
 //            }
         }
     }

video/app/src/main/java/com/duben/dayplaylet/ui/adapter/TasksAdapter.kt

@@ -7,14 +7,19 @@ import android.view.ViewGroup
 import android.widget.FrameLayout
 import android.widget.ProgressBar
 import android.widget.TextView
+import androidx.core.content.ContextCompat
 import androidx.recyclerview.widget.RecyclerView
 import com.duben.dayplaylet.R
 import com.duben.dayplaylet.mvp.model.BannerBean
+import com.duben.dayplaylet.mvp.model.TaskInfoBean
+import com.duben.dayplaylet.utils.BubbleUtils
+import com.duben.dayplaylet.utils.SpanUtils
+import kotlinx.android.synthetic.main.dialog_sign.*
 
 /**
  * 任务中心-列表适配器
  */
-class TasksAdapter(context: Context, var taskData: MutableList<BannerBean>? = null) :
+class TasksAdapter(context: Context, var taskData: MutableList<TaskInfoBean.TaskItemBean>? = null) :
     RecyclerView.Adapter<TasksAdapter.ViewHolder>() {
 
     private var mContext: Context = context
@@ -28,39 +33,45 @@ class TasksAdapter(context: Context, var taskData: MutableList<BannerBean>? = nu
 
     override fun getItemCount(): Int {
         return if (taskData == null) {
-            30
+            0
         } else {
             taskData!!.size
         }
     }
 
     override fun onBindViewHolder(holder: ViewHolder, position: Int) {
-//        taskData?.let {
-//            // 一级标题
-//            holder.itemTaskTitle.text = baseConfig.title
-//            // 二级内容
-//            holder.itemTaskContent.text = baseConfig.context
-//            // 按钮文字
-//            holder.itemTaskClick.text = baseConfig.buttonText
-//            // 金币
-//            holder.itemTaskMoney.text = baseConfig.coinText
-//            // 提现券
-//            holder.itemTaskCoupons.text = baseConfig.diText
-//
-//            // 进度条 （文本）
-//            if (baseConfig.runingMax > 0) {
-//                holder.itemTaskPb.visibility = View.VISIBLE
-//                holder.itemTaskPb.max = baseConfig.runingMax
-//                holder.itemTaskPb.progress = baseConfig.runingComplete
-//
-//                // 进度条文字
-//                holder.itemTaskProgress.visibility = View.VISIBLE
-//                holder.itemTaskProgress.text = baseConfig.runingText
-//            } else {
-//                holder.itemTaskPb.visibility = View.GONE
-//                holder.itemTaskProgress.visibility = View.GONE
-//            }
-//        }
+        val bean = taskData?.get(position)?.base
+        bean?.let {
+            holder.itemTaskTitle.text = it.title
+            var (left, right) = it.content.split("#")
+            holder.item_task_text.text = SpanUtils()
+                .append(left)
+                .setForegroundColor(mContext.resources.getColor(R.color.title_bg))
+                .append(it.showMax)
+                .setForegroundColor(mContext.resources.getColor(R.color.red))
+                .append(right)
+                .setForegroundColor(mContext.resources.getColor(R.color.title_bg))
+                .create()
+
+            holder.itemTaskProgress.text = SpanUtils()
+                .append("已完成")
+                .setForegroundColor(mContext.resources.getColor(R.color.title_bg))
+                .append("${it.complete}/${it.max}")
+                .setForegroundColor(mContext.resources.getColor(R.color.red))
+                .create()
+
+            //状态 0未完成，1 待领取 2 已领取
+            when (it.rewardStatus) {
+                0 -> {
+                    holder.itemTaskClick.text = "去完成"
+                    holder.itemTaskClick.background= ContextCompat.getDrawable(mContext, R.drawable.shape_task_btn)
+                }
+                1 -> {
+                    holder.itemTaskClick.text = "领取奖励"
+                    holder.itemTaskClick.background= ContextCompat.getDrawable(mContext, R.drawable.shape_task_btn_green)
+                }
+            }
+        }
     }
 
     inner class ViewHolder(itemView: View) : RecyclerView.ViewHolder(itemView) {
@@ -75,7 +86,7 @@ class TasksAdapter(context: Context, var taskData: MutableList<BannerBean>? = nu
     }
 
     interface ItemListener {
-//        fun onItemClick(bean: MyInfo.AutoListBean?)
+        fun onItemClick(bean: TaskInfoBean.TaskItemBean)
     }
 
 }
\ No newline at end of file

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

@@ -5,6 +5,7 @@ import android.animation.ValueAnimator
 import android.app.Dialog
 import android.graphics.Path
 import android.graphics.PathMeasure
+import android.os.Bundle
 import android.os.Handler
 import android.os.Looper
 import android.text.TextUtils
@@ -33,6 +34,7 @@ import com.duben.dayplaylet.mvp.views.HomeView
 import com.duben.dayplaylet.ui.activitys.LoadingActivity
 import com.duben.dayplaylet.ui.activitys.MainActivity
 import com.duben.dayplaylet.ui.activitys.WatchRecordActivity
+import com.duben.dayplaylet.ui.activitys.WebActivity
 import com.duben.dayplaylet.ui.adapter.HomeVideoPageAdapter
 import com.duben.dayplaylet.ui.adapter.ImageTitleAdapter
 import com.duben.dayplaylet.ui.adapter.TopAdapter
@@ -71,9 +73,11 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
     private val topList = mutableListOf<VedioBean>()
     private var vpAdapter: HomeVideoPageAdapter? = null
     private var topAdapter: TopAdapter? = null
-    private var userInfo: UserBean? = null
+    private var userInfo: UserBean.UserMsgBean? = null
     private var signMsg: SignInfoBean.SignMsgBean? = null
     private var isSignDrawFlag = false // 签到2次打款 用户主动取消流程结束
+    private var isShowSignFlag = false
+    private var isShowNewuserFlag = false
 
     // 新人红包
     var newcomerDialog: NewcomerDialog? = null
@@ -126,6 +130,8 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
         srlMainPage.setOnRefreshListener(this)
         tv_main_watchmore.setOnClickListener(this)
         iv_main_sign.setOnClickListener(this)
+        btn_draw_gold.setOnClickListener(this)
+        btn_draw_cash.setOnClickListener(this)
     }
 
     override fun onClick(v: View?) {
@@ -136,6 +142,8 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
                 readyGo(WatchRecordActivity::class.java)
             }
             R.id.iv_main_sign -> {
+                if (signMsg == null) return
+
                 if (signMsg!!.signDay <= 7) {
                     showSignDialog()
                 } else {
@@ -185,7 +193,13 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
                             // 3、发放奖励弹窗
                             if (!isSignDrawFlag) {
                                 signDrawDialog?.dismiss()
-                                readyGo(LoadingActivity::class.java)
+                                val bundle = Bundle()
+                                if (signMsg != null) {
+                                    val signWeekCashArr = signMsg!!.signWeekCashArr
+                                    val cash = signWeekCashArr[signMsg!!.signDay - 1]
+                                    bundle.putString(LoadingActivity.TEXT, "${cash}元现金马上到账")
+                                }
+                                readyGo(LoadingActivity::class.java, bundle)
                                 Handler(Looper.getMainLooper()).postDelayed({
                                     showAd(Constant.CARRIERTYPE_SIGN_DRAW)
                                 }, 2500)
@@ -256,18 +270,18 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
     }
 
     override fun getUserSuc(data: UserBean) {
-        this.userInfo = data
+        this.userInfo = data.userMsg
 
         UserManager.getInstance().saveUserInfo(data)
-        tv_cash.text = "${FormatUtil.getCashFormaet(data.rewardCoin)}元"
-        tv_gold.text = "${data.diamonds}个"
+        tv_cash.text = "${FormatUtil.getCashFormaet(data.userMsg.rewardCoin)}元"
+        tv_gold.text = "${data.userMsg.diamonds}个"
 
         // 新人红包只执行一次
-        if (data.rewardFirst == 0) {
+        if (data.userMsg.rewardFirst == 0) {
             // 弹出新人红包
-            if (newcomerDialog != null && !newcomerDialog!!.isShowing) {
-                showNewcomerDialog(data.rewardCoin)
-                return
+            if (!isShowNewuserFlag) {
+                isShowNewuserFlag = true
+                showNewcomerDialog(data.userMsg.rewardCoin)
             }
         }
 
@@ -285,7 +299,10 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
             AppConfig.signCash1 = FormatUtil.sub(signMsg!!.surCash, signMsg!!.cashCashFirst)
             AppConfig.signCash2 = FormatUtil.sub(AppConfig.signCash1, signMsg!!.cashCashSecond)
             if (signMsg!!.signDay <= 7) {
-                showSignDialog()
+                if (!isShowSignFlag && userInfo?.rewardFirst != 0) {
+                    isShowSignFlag = true
+                    showSignDialog()
+                }
             }
         }
     }
@@ -358,7 +375,9 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
                 if (times == 0) {
                     isSignDrawFlag = true
                     // 发放奖励弹窗
-                    readyGo(LoadingActivity::class.java)
+                    val bundle = Bundle()
+                    bundle.putString(LoadingActivity.TEXT, "正在为您发放奖励..")
+                    readyGo(LoadingActivity::class.java, bundle)
                     Handler(Looper.getMainLooper()).postDelayed({
                         showAd(Constant.CARRIERTYPE_SIGN_DRAW)
                     }, 2500)
@@ -367,7 +386,9 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
                 } else if (times == 2) {
                     isSignDrawFlag = true
                     // 发放奖励弹窗
-                    readyGo(LoadingActivity::class.java)
+                    val bundle = Bundle()
+                    bundle.putString(LoadingActivity.TEXT, "正在为您发放奖励..")
+                    readyGo(LoadingActivity::class.java, bundle)
                     Handler(Looper.getMainLooper()).postDelayed({
                         showAd(Constant.CARRIERTYPE_SIGN_7)
                     }, 2500)
@@ -436,37 +457,30 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
 
         DialogUtils.showSignDialog(requireContext(), object : DialogListener() {
             override fun onClick(dialog: Dialog?, v: View) {
-                dialog?.dismiss()
+
                 when (v.id) {
+                    R.id.tv_sign_rule -> {
+                        val bundle = Bundle()
+                        bundle.putString(WebActivity.WEB_TITLE, "提现规则")
+                        bundle.putString(WebActivity.WEB_URL, Constant.DRAWRULE_URL)
+                        readyGo(WebActivity::class.java, bundle)
+                    }
+                    R.id.iv_close -> {
+                        dialog?.dismiss()
+                    }
                     R.id.tv_sign_withdraw -> {
-//                        readyGo(LoadingActivity::class.java)
-//                        Handler(Looper.getMainLooper()).postDelayed({
-//                            showAd(Constant.CARRIERTYPE_SIGN)
-//                        }, 2500)
-
-
-                        // 测试逻辑
+                        dialog?.dismiss()
+
+                        val bundle = Bundle()
+                        if (signMsg != null) {
+                            val signWeekCashArr = signMsg!!.signWeekCashArr
+                            val cash = signWeekCashArr[signMsg!!.signDay - 1]
+                            bundle.putString(LoadingActivity.TEXT, "${cash}元现金马上到账")
+                        }
+                        readyGo(LoadingActivity::class.java, bundle)
                         Handler(Looper.getMainLooper()).postDelayed({
-                            // 1、第一次打款
-                            showDrawAlipayDialog(signMsg?.cashCashFirst ?: 0.01)
-                            Handler(Looper.getMainLooper()).postDelayed({
-                                // 2、展示签到余额
-                                drawAlipayDialog?.dismiss()
-                                showSignDrawDialog(0)
-                                Handler(Looper.getMainLooper()).postDelayed({
-                                    if (!isSignDrawFlag) {
-                                        // 3、发放奖励弹窗
-                                        signDrawDialog?.dismiss()
-                                        readyGo(LoadingActivity::class.java)
-                                        Handler(Looper.getMainLooper()).postDelayed({
-                                            showAd(Constant.CARRIERTYPE_SIGN_DRAW)
-                                        }, 2500)
-                                    }
-
-                                    isSignDrawFlag = false
-                                }, 3500)
-                            }, 1500)
-                        }, 300)
+                            showAd(Constant.CARRIERTYPE_SIGN)
+                        }, 2500)
                     }
                 }
             }

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

 package com.duben.dayplaylet.ui.fragment
 
+import android.os.Bundle
 import android.text.TextUtils
 import android.view.View
 import com.duben.dayplaylet.R
+import com.duben.dayplaylet.ad.AdManager
+import com.duben.dayplaylet.ad.AdStatusListener
+import com.duben.dayplaylet.ad.NoPreAdManager
 import com.duben.dayplaylet.common.AppConfig
 import com.duben.dayplaylet.common.Constant
 import com.duben.dayplaylet.manager.UserManager
+import com.duben.dayplaylet.mvp.model.TaskInfoBean
 import com.duben.dayplaylet.mvp.model.UserBean
 import com.duben.dayplaylet.mvp.presenters.MyPresenter
 import com.duben.dayplaylet.mvp.views.MyView
+import com.duben.dayplaylet.ui.activitys.MainActivity
 import com.duben.dayplaylet.ui.activitys.SettingsActivity
+import com.duben.dayplaylet.ui.activitys.TaskAwardActivity
 import com.duben.dayplaylet.ui.adapter.TasksAdapter
 import com.duben.dayplaylet.ui.fragment.base.LazyLoadBaseFragment
 import com.duben.dayplaylet.ui.fragment.draw.DrawCashDialog
-import com.duben.dayplaylet.utils.BubbleUtils
 import com.duben.dayplaylet.utils.SpanUtils
 import com.duben.library.utils.nodoubleclick.AntiShake
 import kotlinx.android.synthetic.main.fragment_main_my.*
@@ -43,8 +49,38 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
     private fun initRecy() {
         tasksAdapter = TasksAdapter(mContext)
         recy_tasks.adapter = tasksAdapter
-
-//        recy_tasks.adapter?.notifyDataSetChanged()
+        tasksAdapter?.setItemListener(object : TasksAdapter.ItemListener {
+            override fun onItemClick(bean: TaskInfoBean.TaskItemBean) {
+//                AppConfig.taskListId = bean.base.list_id
+                //状态 0未完成，1 待领取 2 已领取
+                when (bean.base.rewardStatus) {
+                    0 -> {
+                        (requireActivity() as MainActivity).clickTab1Layout()
+                    }
+                    1 -> {
+                        val bundle = Bundle()
+                        bundle.putInt(TaskAwardActivity.LIST_ID, bean.base.list_id)
+                        bundle.putInt(TaskAwardActivity.MORE_REDPACKET, bean.base.moreCoin)
+                        bundle.putInt(TaskAwardActivity.MORE_YUANBAO, bean.base.moreDi)
+                        bundle.putInt(TaskAwardActivity.REDPACKET, bean.base.rewardCoin)
+                        bundle.putString(TaskAwardActivity.CARRIERTYPE, bean.base.rewardCarrier)
+                        bundle.putString(
+                            TaskAwardActivity.CARRIERTYPE_ALL,
+                            bean.base.rewardMoreCarrier
+                        )
+                        bundle.putBoolean(
+                            TaskAwardActivity.FLAG_REDPACKET,
+                            bean.base.isRewardMoreCoinShowTip
+                        )
+                        bundle.putBoolean(
+                            TaskAwardActivity.FLAG_YUANBAO,
+                            bean.base.isRewardMoreDiShowTip
+                        )
+                        readyGo(TaskAwardActivity::class.java, bundle)
+                    }
+                }
+            }
+        })
     }
 
     override fun onFragmentFirstVisible() {
@@ -52,7 +88,6 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
 
     }
 
-
     override fun onDestroy() {
         super.onDestroy()
         myPresenter.detachView()
@@ -62,10 +97,11 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         super.onFragmentResume()
 
         if (AppConfig.fragmentClickFlag == Constant.FRAGMENT_CLICK_FOUR) {
-//            if (AntiShake.check(ll_my_record?.id)) return
+            if (AntiShake.check(tv_my_id?.id)) return
 
             if (!TextUtils.isEmpty(userManager?.userID)) {
                 myPresenter.getMyInfo()
+                myPresenter.rdUserHallList()
             } else {
                 myPresenter.userLogin()
             }
@@ -89,10 +125,12 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
     }
 
     override fun getUserSuc(data: UserBean) {
-        loginStatus(data)
+        tv_my_id.text = "用户ID:${data.userMsg.idcode}"
     }
 
-    private fun loginStatus(consumer: UserBean) {
+    override fun getHallListSuc(data: TaskInfoBean) {
+        tasksAdapter?.taskData = data.list
+        recy_tasks.adapter?.notifyDataSetChanged()
     }
 
     private fun initListener() {
@@ -142,4 +180,51 @@ class MyFragment : LazyLoadBaseFragment(), MyView, View.OnClickListener {
         }
     }
 
+    private fun showAd(carrierType: String) {
+        AdManager.instance.showAd(requireActivity(), carrierType,
+            object : AdStatusListener {
+                var canFail = false
+                override fun adSuccess() {
+                    canFail = true
+                }
+
+                override fun adFail() {
+                    if (canFail) return
+
+                    showLoading("正在获取视频", false)
+                    NoPreAdManager.loadVideoAd(
+                        requireActivity(),
+                        carrierType, object : AdStatusListener {
+                            override fun adFail() {
+                                hideLoading()
+                                showToast("广告太火爆了，请稍候再试")
+                            }
+
+                            override fun adSuccess() {
+                                hideLoading()
+                            }
+
+                            override fun adClose(vo: HashMap<String, Any>?) {
+                                hideLoading()
+                                adCloseNext(carrierType)
+                            }
+                        })
+                }
+
+                override fun adClose(vo: HashMap<String, Any>?) {
+                    adCloseNext(carrierType)
+                }
+            })
+    }
+
+    /**
+     * 点击关闭广告
+     */
+    private fun adCloseNext(carrierType: String) {
+        when (carrierType) {
+//            Constant.CARRIERTYPE_REWARD_FIRST -> {
+//
+//            }
+        }
+    }
 }
\ No newline at end of file

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/DrawAlipayDialog.kt

@@ -7,6 +7,7 @@ import android.view.Gravity
 import android.view.KeyEvent
 import android.view.WindowManager
 import com.duben.dayplaylet.R
+import com.duben.dayplaylet.common.AppConfig
 import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
 import com.duben.dayplaylet.utils.BubbleUtils
@@ -26,7 +27,7 @@ class DrawAlipayDialog(private val context: Context, val cash: Double) :
         lp = window!!.attributes
         lp.gravity = Gravity.CENTER
         lp.width = WindowManager.LayoutParams.MATCH_PARENT
-        lp.windowAnimations = R.style.DialogAnimBottom
+        lp.windowAnimations = R.style.DialogAnimFade
         window!!.attributes = lp
 
         // 设置外部不可关闭
@@ -44,5 +45,6 @@ class DrawAlipayDialog(private val context: Context, val cash: Double) :
             tv_draw_cash2.text = cashStr.subSequence(2, 3)
             tv_draw_cash3.text = cashStr.subSequence(3, 4)
         }
+        tv_draw_text.text = "剩余${AppConfig.signCash1}元已存入签到余额"
     }
 }
\ No newline at end of file

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/NewcomerDialog.kt

@@ -12,6 +12,10 @@ import android.widget.TextView
 import com.duben.dayplaylet.R
 import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
+import com.duben.dayplaylet.utils.BubbleUtils
+import com.duben.dayplaylet.utils.SpanUtils
+import kotlinx.android.synthetic.main.dialog_newcomer.*
+import kotlinx.android.synthetic.main.dialog_sign.*
 import java.math.BigDecimal
 
 class NewcomerDialog(private val context: Context, private val rewardCoin: Int) :
@@ -19,8 +23,6 @@ class NewcomerDialog(private val context: Context, private val rewardCoin: Int)
         context, R.style.dialog
     ) {
     private val lp: WindowManager.LayoutParams
-    private val iv_newcomer_bg: ImageView
-    private val tv_newcomer_time: TextView
     var timer: CountDownTimerSupport? = null
     private var isClickBtn = false
 
@@ -53,8 +55,6 @@ class NewcomerDialog(private val context: Context, private val rewardCoin: Int)
         }
 
         // 查找View
-        tv_newcomer_time = findViewById<View>(R.id.tv_newcomer_time) as TextView
-        iv_newcomer_bg = findViewById<View>(R.id.iv_newcomer_bg) as ImageView
         iv_newcomer_bg.setOnClickListener {
             isClickBtn = true
             adListener?.showAd()
@@ -65,10 +65,15 @@ class NewcomerDialog(private val context: Context, private val rewardCoin: Int)
         val rateBig = BigDecimal("10000")
         val cashStr = allcoinBig.divide(rateBig).setScale(2, BigDecimal.ROUND_DOWN).toString()
 
-        println("mcg -->>>>>>>>>>>" + cashStr)
+        tv_newcomer_cash.text = SpanUtils()
+            .append(cashStr)
+            .setFontSize(BubbleUtils.sp2px(40))
+            .append("元")
+            .create()
+
         Handler().postDelayed({
             startTimer()
-        }, 200)
+        }, 900)
     }
 
     override fun dismiss() {

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/SignDialog.kt

@@ -85,6 +85,7 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             1 -> {
                 if (status == 0) {
                     tv_sign_status1.text = "可领取"
+                    tv_sign_money1.text = "${cash}元"
                     tv_sign_money1.setTextColor(ContextCompat.getColor(context, R.color.red))
                     ll_sign_status1.setBackgroundResource(R.mipmap.bg_no_sign)
                 } else if (status == 1) {
@@ -100,6 +101,7 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             2 -> {
                 if (status == 0) {
                     tv_sign_status2.text = "可领取"
+                    tv_sign_money2.text = "${cash}元"
                     tv_sign_money2.setTextColor(ContextCompat.getColor(context, R.color.red))
                     ll_sign_status2.setBackgroundResource(R.mipmap.bg_no_sign)
                 } else if (status == 1) {
@@ -115,6 +117,7 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             3 -> {
                 if (status == 0) {
                     tv_sign_status3.text = "可领取"
+                    tv_sign_money3.text = "${cash}元"
                     tv_sign_money3.setTextColor(ContextCompat.getColor(context, R.color.red))
                     ll_sign_status3.setBackgroundResource(R.mipmap.bg_no_sign)
                 } else if (status == 1) {
@@ -130,6 +133,7 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             4 -> {
                 if (status == 0) {
                     tv_sign_status4.text = "可领取"
+                    tv_sign_money4.text = "${cash}元"
                     tv_sign_money4.setTextColor(ContextCompat.getColor(context, R.color.red))
                     ll_sign_status4.setBackgroundResource(R.mipmap.bg_no_sign)
                 } else if (status == 1) {
@@ -145,6 +149,7 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             5 -> {
                 if (status == 0) {
                     tv_sign_status5.text = "可领取"
+                    tv_sign_money5.text = "${cash}元"
                     tv_sign_money5.setTextColor(ContextCompat.getColor(context, R.color.red))
                     ll_sign_status5.setBackgroundResource(R.mipmap.bg_no_sign)
                 } else if (status == 1) {
@@ -160,6 +165,7 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             6 -> {
                 if (status == 0) {
                     tv_sign_status6.text = "可领取"
+                    tv_sign_money6.text = "${cash}元"
                     tv_sign_money6.setTextColor(ContextCompat.getColor(context, R.color.red))
                     ll_sign_status6.setBackgroundResource(R.mipmap.bg_no_sign)
                 } else if (status == 1) {
@@ -175,14 +181,15 @@ class SignDialog(context: Context, listener: DialogListener, signMsg: SignInfoBe
             7 -> {
                 if (status == 0) {
                     tv_sign_status7.text = "可领取"
+                    tv_sign_money7.text = "${cash}元"
                     tv_sign_money7.setTextColor(ContextCompat.getColor(context, R.color.red))
-                    ll_sign_status7.setBackgroundResource(R.mipmap.bg_no_sign)
+                    ll_sign_status7.setBackgroundResource(R.mipmap.bg_no_sign7)
                 } else if (status == 1) {
                     tv_sign_status7.visibility = View.GONE
                     tv_sign_money7.visibility = View.GONE
-                    ll_sign_status7.setBackgroundResource(R.mipmap.bg_sign)
+                    ll_sign_status7.setBackgroundResource(R.mipmap.bg_sign7)
                 } else {
-                    ll_sign_status7.setBackgroundResource(R.mipmap.bg_sign_green)
+                    ll_sign_status7.setBackgroundResource(R.mipmap.bg_sign_green7)
                     tv_sign_status7.text = "第${signDay}天"
                     tv_sign_money7.text = "${cash}元"
                 }

video/app/src/main/java/com/duben/dayplaylet/ui/widgets/SignDrawDialog.kt

@@ -5,8 +5,10 @@ import android.content.Context
 import android.os.Handler
 import android.view.Gravity
 import android.view.KeyEvent
+import android.view.View
 import android.view.WindowManager
 import com.duben.dayplaylet.R
+import com.duben.dayplaylet.common.AppConfig
 import com.duben.dayplaylet.mvp.model.SignInfoBean
 import com.duben.dayplaylet.ui.widgets.countdowntimer.CountDownTimerSupport
 import com.duben.dayplaylet.ui.widgets.countdowntimer.OnCountDownTimerListener
@@ -54,24 +56,57 @@ class SignDrawDialog(
             } else false
         }
 
-        tv_sign_draw.setOnClickListener {
+        ll_sign_draw_next.setOnClickListener {
             adListener?.click()
         }
 
         iv_close.setOnClickListener {
             adListener?.close()
         }
+        iv_closetop.setOnClickListener {
+            adListener?.close()
+        }
 
-        tv_sign_draw_cash.text = SpanUtils()
-            .append("￥")
-            .append("2.92")
-            .setFontSize(BubbleUtils.sp2px(40))
-            .create()
+//        * times 第几次进入
+//        * 0-7天内 第一次进入,用定时器
+//        *
+//        * 1-7天内 第二次进入.不用定时
+//        * 2-7天后 第一次进入.不用定时
+        when(times){
+            0 ->{
+                // 用定时器，第一次打款
+                Handler().postDelayed({
+                    startTimer()
+                }, 200)
+
+                iv_close.visibility= View.GONE
+                tv_sign_draw_timer.visibility= View.VISIBLE
+                iv_sign_draw.visibility= View.VISIBLE
+                iv_closetop.visibility= View.VISIBLE
+                iv_sign_draw_title.setImageResource(R.mipmap.bg_draw_title0)
+
+                tv_sign_draw_cash.text = SpanUtils()
+                    .append("￥")
+                    .append(AppConfig.signCash1.toString())
+                    .create()
+                tv_sign_draw.text="继续提现"
+            }
+            1 ->{
+                iv_close.visibility= View.VISIBLE
+                tv_sign_draw_timer.visibility= View.GONE
+                iv_sign_draw.visibility= View.GONE
+                iv_closetop.visibility= View.GONE
+                iv_sign_draw_title.setImageResource(R.mipmap.bg_draw_title)
+
+                tv_sign_draw_cash.text = SpanUtils()
+                    .append("￥")
+                    .append(AppConfig.signCash2.toString())
+                    .create()
+                tv_sign_draw.text="明日再来"
+            }
+            2 ->{
 
-        if (times == 0) {
-            Handler().postDelayed({
-                startTimer()
-            }, 200)
+            }
         }
 
     }
@@ -94,7 +129,7 @@ class SignDrawDialog(
         timer!!.setOnCountDownTimerListener(object : OnCountDownTimerListener {
             override fun onTick(millisUntilFinished: Long) {
                 if (isShowing) {
-//                    tv_newcomer_time?.text = "${millisUntilFinished / 1000}秒后自动领取"
+                    tv_sign_draw_timer?.text = "${millisUntilFinished / 1000}s自动跳转"
                 }
             }
 

video/app/src/main/java/com/duben/dayplaylet/utils/AESUtils.java

@@ -15,7 +15,7 @@ import Decoder.BASE64Encoder;
 
 public class AESUtils {
 
-    private static final String vis = MD5.GetMD5Code("helivideo_2023").substring(8, 24);
+    private static final String vis = MD5.GetMD5Code("vcash_2023").substring(8, 24);
     public static String CIPHER_ALGORITHM = "AES/CBC/PKCS5Padding"; // optional value AES/DES/DESede
 
     private static SecretKeySpec getKey(String strKey) throws Exception {

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

@@ -2,7 +2,7 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
     android:shape="rectangle">
     <!-- 填充的颜色 -->
-    <solid android:color="#0000ff" />
+    <solid android:color="#1177EA" />
     <!-- 设置按钮的四个角为弧形 -->
     <!-- android:radius 弧形的半径 -->
     <corners android:radius="15dip" />

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+    <!-- 填充的颜色 -->
+    <solid android:color="#EEEEFE" />
+    <!-- 设置按钮的四个角为弧形 -->
+    <!-- android:radius 弧形的半径 -->
+    <corners android:radius="5dip" />
+
+</shape>
\ No newline at end of file

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

+<?xml version="1.0" encoding="utf-8"?>
+<shape xmlns:android="http://schemas.android.com/apk/res/android">
+    <corners android:radius="500dp" />
+    <solid android:color="#31b920" />
+</shape>
\ No newline at end of file

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

@@ -7,19 +7,21 @@
         android:layout_width="300dp"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
         <ImageView
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@mipmap/bg_vip_btn"></ImageView>
+            android:src="@mipmap/ic_alipay_title"></ImageView>
 
         <LinearLayout
-            android:layout_width="300dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/shape_bg_nine"
+            android:layout_marginTop="10dp"
+            android:paddingTop="100dp"
+            android:background="@mipmap/bg_alipay"
             android:gravity="center"
             android:orientation="horizontal">
 
@@ -45,7 +47,9 @@
                 android:layout_width="20dp"
                 android:layout_height="20dp"
                 android:layout_gravity="bottom"
-                android:layout_margin="10dp"
+                android:layout_marginLeft="10dp"
+                android:layout_marginRight="10dp"
+                android:layout_marginBottom="30dp"
                 android:background="@drawable/shape_bg_blue"></View>
 
             <TextView
@@ -90,9 +94,7 @@
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
-            android:background="@drawable/shape_bg_recommend"
             android:gravity="center"
-            android:text="秒后自动领取"
             android:textColor="@color/white"
             android:textSize="13sp"></TextView>
     </LinearLayout>

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

@@ -9,13 +9,27 @@
         android:layout_centerInParent="true"
         android:orientation="vertical">
 
-        <ImageView
+
+        <FrameLayout
             android:id="@+id/iv_newcomer_bg"
-            android:layout_width="200dp"
-            android:layout_height="300dp"
-            android:scaleType="fitXY"
-            android:src="@mipmap/ic_nine_item_bg" />
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:src="@mipmap/bg_newuser" />
 
+            <TextView
+                android:id="@+id/tv_newcomer_cash"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:layout_marginTop="150dp"
+                android:gravity="center"
+                android:textColor="@color/white"
+                android:textSize="20sp"></TextView>
+        </FrameLayout>
 
         <TextView
             android:id="@+id/tv_newcomer_time"
@@ -24,8 +38,7 @@
             android:layout_gravity="center_horizontal"
             android:layout_marginTop="10dp"
             android:gravity="center"
-            android:text="提醒我"
             android:textColor="@color/white"
-            android:textSize="13sp"></TextView>
+            android:textSize="14sp"></TextView>
     </LinearLayout>
 </RelativeLayout>

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

@@ -4,29 +4,45 @@
     android:layout_height="match_parent">
 
     <LinearLayout
-        android:layout_width="300dp"
+        android:layout_width="wrap_content"
         android:layout_height="wrap_content"
         android:layout_centerInParent="true"
+        android:gravity="center_horizontal"
         android:orientation="vertical">
 
-        <ImageView
+        <FrameLayout
             android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:layout_gravity="center_horizontal"
-            android:src="@mipmap/bg_vip_btn"></ImageView>
+            android:layout_height="wrap_content">
+
+            <ImageView
+                android:id="@+id/iv_sign_draw_title"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="center_horizontal"
+                android:src="@mipmap/bg_draw_title"></ImageView>
+
+            <ImageView
+                android:id="@+id/iv_closetop"
+                android:visibility="gone"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                android:layout_gravity="right"
+                android:src="@mipmap/ic_draw_quit" />
+        </FrameLayout>
+
 
         <LinearLayout
-            android:layout_width="300dp"
+            android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:layout_centerInParent="true"
-            android:background="@drawable/shape_bg_nine"
+            android:layout_marginTop="10dp"
+            android:background="@mipmap/bg_draw"
             android:orientation="vertical">
 
             <TextView
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="16dp"
+                android:layout_marginTop="20dp"
                 android:layout_marginBottom="10dp"
                 android:text="我的签到余额"
                 android:textColor="@color/switch_blue"
@@ -34,15 +50,12 @@
                 android:textStyle="bold"></TextView>
 
             <LinearLayout
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_width="200dp"
+                android:layout_height="120dp"
                 android:layout_gravity="center_horizontal"
-                android:background="@drawable/shape_bg_nine"
-                android:orientation="vertical"
-                android:paddingLeft="10dp"
-                android:paddingTop="16dp"
-                android:paddingRight="10dp"
-                android:paddingBottom="6dp">
+                android:background="@drawable/shape_bg_draw"
+                android:gravity="center"
+                android:orientation="vertical">
 
                 <TextView
                     android:id="@+id/tv_sign_draw_cash"
@@ -51,8 +64,8 @@
                     android:layout_gravity="center_horizontal"
                     android:text="123"
                     android:textColor="@color/switch_blue"
-
-                    android:textSize="20sp"></TextView>
+                    android:textSize="40sp"
+                    android:textStyle="bold"></TextView>
 
                 <TextView
                     android:layout_width="wrap_content"
@@ -60,29 +73,61 @@
                     android:layout_gravity="center_horizontal"
                     android:layout_marginTop="10dp"
                     android:gravity="center"
-                    android:text="余额提现完毕"
-                    android:textColor="@color/white"
+                    android:text="余额保留至提现完毕"
+                    android:textColor="#6DA8FE"
                     android:textSize="13sp"></TextView>
             </LinearLayout>
 
-            <TextView
-                android:id="@+id/tv_sign_draw"
+            <LinearLayout
+                android:id="@+id/ll_sign_draw_next"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_gravity="center_horizontal"
-                android:layout_marginTop="10dp"
-                android:background="@drawable/shape_bg_recommend"
+                android:layout_marginTop="20dp"
+                android:background="@mipmap/bg_draw_next"
                 android:gravity="center"
-                android:text="秒后自动领取"
-                android:textColor="@color/white"
-                android:textSize="13sp"></TextView>
+                android:orientation="horizontal">
+
+                <ImageView
+                    android:id="@+id/iv_sign_draw"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_marginRight="14dp"
+                    android:visibility="gone"
+                    android:src="@mipmap/ic_quit_yuan"></ImageView>
+
+                <TextView
+                    android:id="@+id/tv_sign_draw"
+                    android:layout_width="wrap_content"
+                    android:layout_height="wrap_content"
+                    android:layout_gravity="center_vertical"
+                    android:layout_toRightOf="@+id/iv_sign_draw"
+                    android:gravity="center"
+                    android:text="继续提现"
+                    android:textColor="@color/white"
+                    android:textSize="20sp"></TextView>
+            </LinearLayout>
         </LinearLayout>
 
+        <TextView
+            android:id="@+id/tv_sign_draw_timer"
+            android:layout_width="wrap_content"
+            android:layout_height="wrap_content"
+            android:layout_gravity="center_horizontal"
+            android:layout_marginTop="10dp"
+            android:visibility="gone"
+            android:gravity="center"
+            android:text="s自动领取"
+            android:textColor="@color/white"
+            android:textSize="13sp"></TextView>
+
         <ImageView
             android:id="@+id/iv_close"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal"
-            android:src="@mipmap/ic_quit_yuan" />
+            android:layout_marginTop="10dp"
+            android:src="@mipmap/ic_draw_quit" />
     </LinearLayout>
 </RelativeLayout>

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

 <?xml version="1.0" encoding="utf-8"?>
-<ScrollView xmlns:android="http://schemas.android.com/apk/res/android"
+<androidx.core.widget.NestedScrollView xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -283,7 +283,7 @@
             android:paddingBottom="10dp"
             app:layoutManager="androidx.recyclerview.widget.LinearLayoutManager" />
     </LinearLayout>
-</ScrollView>
+</androidx.core.widget.NestedScrollView>
 
 
 

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

@@ -48,7 +48,7 @@
                 <ImageView
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
-                    android:src="@mipmap/ic_close" />
+                    android:src="@mipmap/ic_task_redpkg" />
 
                 <TextView
                     android:id="@+id/item_task_text"
@@ -72,7 +72,7 @@
 
         <TextView
             android:id="@+id/item_task"
-            android:layout_width="76dp"
+            android:layout_width="80dp"
             android:layout_height="30dp"
             android:layout_gravity="right|bottom"
             android:layout_marginBottom="10dp"

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

@@ -35,7 +35,6 @@
                 android:gravity="center"
                 android:maxWidth="60dp"
                 android:minWidth="40dp"
-                android:text="-"
                 android:textColor="@color/white"
                 android:textSize="14sp" />
 

video/app/src/main/res/values/colors.xml

@@ -5,8 +5,8 @@
     <color name="white">#FFFFFF</color>
     <color name="black">#000000</color>
     <color name="gray">#808080</color>
-    <color name="green">#00ff00</color>
-    <color name="red">#ED385B</color>
+    <color name="green">#09BB07</color>
+    <color name="red">#FC3629</color>
     <color name="graya">#AAAAAA</color>
     <color name="full_transparent">#00000000</color>
     <color name="half_transparent">#80000000</color>

video/gradle.properties

@@ -23,7 +23,7 @@ android.nonTransitiveRClass=true
 
 #DEBUG_URL="https://test.mints-id.com/camera-api/"
 #DEBUG_URL="http://cui.mints-id.com/"
-DEBUG_URL="https://api.mints-tech.cn/camera-api/"
+DEBUG_URL="http://api.mints-tech.cn/vcash-api/"
 RELEASE_URL="https://api.mints-tech.cn/camera-api/"
 
 RELEASE_KEY_PASSWORD=mintsdayplaylet
@@ -48,12 +48,12 @@ RELEASE_TALKING_DATA_KEY="50775FE6C0D44F4AB21B640BDF71E306"
 #umeng
 RELEASE_UMENG_KEY=64b8de13a1a164591b5133df
 
-GROMORE_APP_ID="5412556"
-GROMORE_SPLASH_CODE="102398740"
-GROMORE_VIDEO_CODE="102398300"
-GROMORE_EXPRESS_CODE="102405261"
-GROMORE_MY_EXPRESS_CODE="102413160"
-GROMORE_DRAW_CODE="102405069"
-GROMORE_BANNER_CODE="102405532"
-GROMORE_FULL_CODE="102405532"
-GROMORE_HALF_CODE="102405532"
+GROMORE_APP_ID="5434788"
+GROMORE_SPLASH_CODE="102464361"
+GROMORE_VIDEO_CODE="102465110"
+GROMORE_EXPRESS_CODE="102464552"
+GROMORE_MY_EXPRESS_CODE="102464829"
+GROMORE_DRAW_CODE=""
+GROMORE_BANNER_CODE="102464550"
+GROMORE_FULL_CODE="102464082"
+GROMORE_HALF_CODE="102464551"