[李俊岐]福利页添加广告间隔

app/src/main/java/com/ym/msdh/game/activity/WelfareActivity.kt

@@ -7,6 +7,7 @@ import android.content.DialogInterface
 import android.view.View
 import android.view.animation.AnimationUtils
 import androidx.recyclerview.widget.LinearLayoutManager
+import btmsdkobf.cd
 
 import com.ym.msdh.game.adapter.WelfareDiamondAdapter
 import com.ym.msdh.game.adapter.WelfareTaskAdpater
@@ -109,8 +110,8 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
                 0 -> {
                     EventUtils.onEvent("fuli_go_click_${data.sid}")
                     if (data.opentype == NewsEntity.AD_TYPE_SDK) {
-                        if (data.sid != null) {
-                            showAd(data.sid!!)
+                        if (data?.sid != null) {
+                            mPresenter?.getWelfareVideoCd(data?.sid!!)
                         }
                     } else {
                         JumpUtils.adJump(data, this)
@@ -253,6 +254,23 @@ class WelfareActivity : BaseActivity(), WelfareContract.View,
         }
     }
 
+    override fun welfareVideoCdResult(sid: Int,result: ExchangeEntity?) {
+        if (result != null) {
+            if (result?.cd != null) {
+                if (result?.cd == 0) {
+                    showAd(sid)
+                } else {
+                    Utils.showToast(this,"手速太快啦，${result?.cd}秒后再来吧")
+                }
+            } else {
+                showAd(sid)
+            }
+        } else {
+            showAd(sid)
+        }
+
+    }
+
     fun showAd(sId: Int) {
         AdUtils.playRewardAd(this, "welfare_task", object : IAdVideoListener {
             override fun onAdClose() {

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

@@ -96,6 +96,7 @@ class WelfareTaskAdpater :
                     resetAnimator(holder?.layoutStatus)
                     holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_receiveed)
                     holder?.tvStatus.text = "已领取"
+                    holder?.layoutBg.setBackgroundResource(R.drawable.icon_record_bg)
                 }
                 2 -> {
                     holder.ivStatus.setImageResource(R.drawable.icon_item_welfare_task_receive)

app/src/main/java/com/ym/msdh/game/contract/WelfareContract.kt

@@ -9,6 +9,7 @@ class WelfareContract {
         fun taskReceiveListResult(result: TaskCompleteEntity?)
         fun taskCashResult(result: List<FlyBoxEntity>?)
         fun welfareTaskCashResult(result: ExchangeEntity?)
+        fun welfareVideoCdResult(sid: Int,result: ExchangeEntity?)
     }
 
     interface Presenter {

app/src/main/java/com/ym/msdh/game/presenter/WelfarePresenter.kt

@@ -97,4 +97,18 @@ class WelfarePresenter : WelfareContract.Presenter {
             }
         })
     }
+
+    fun getWelfareVideoCd(sid: Int) {
+        GameApiClient.gameApi.getWelfareVideoCd().compose(
+            RxSchedulers.observableIO2Main()
+        ).subscribe(object : BaseObserver<ExchangeEntity>() {
+            override fun onSuccess(result: ExchangeEntity?) {
+                mView?.welfareVideoCdResult(sid,result)
+            }
+
+            override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+                mView?.welfareVideoCdResult(sid,null)
+            }
+        })
+    }
 }
\ No newline at end of file

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

@@ -172,8 +172,7 @@
             <androidx.recyclerview.widget.RecyclerView
                 android:id="@+id/recycler_welfare_task"
                 android:layout_width="match_parent"
-                android:layout_height="wrap_content"
-                android:layout_marginTop="16dp" />
+                android:layout_height="wrap_content" />
 
         </LinearLayout>
 

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

@@ -3,7 +3,6 @@
     android:id="@+id/layout_welfare_item_bg"
     android:layout_width="match_parent"
     android:layout_height="76dp"
-    android:layout_marginBottom="10dp"
     android:background="@drawable/icon_record_bg"
     android:paddingLeft="@dimen/dp_21">
 

library/src/main/java/com/ym/library/module/ExchangeEntity.kt

@@ -8,4 +8,5 @@ class ExchangeEntity {
     var buttonStatus: Int? = 0
     var title: String? = ""
     var type: Int? = 0
+    var cd: Int? = 0
 }
\ No newline at end of file

library/src/main/java/com/ym/library/net/IGameApi.kt

@@ -176,6 +176,15 @@ interface IGameApi {
     @POST(NetConfig.Game.URL_GAME_AD_VIDEO_REPORT)
     fun adVideoReport(): Observable<Response<StatusEntity>>
 
+    /**
+     * 看视频上报
+     * @param
+     * @paramq
+     * @return
+     */
+    @POST(NetConfig.Game.URL_GAME_AD_VIDEO_REPORT)
+    fun adVideoReport(@Query("slot") slot:String): Observable<Response<Any>>
+
     /**
      * 任务领取奖励
      * @param
@@ -308,6 +317,12 @@ interface IGameApi {
     @POST(NetConfig.Game.URL_GAME_WELFARE_TASK_CASH)
     fun getWelfareTaskCash(): Observable<Response<ExchangeEntity>>
 
+    /**
+     * 福利提现广告cd
+     */
+    @GET(NetConfig.Game.URL_GAME_WELFARE_VIDEO_CD)
+    fun getWelfareVideoCd(): Observable<Response<ExchangeEntity>>
+
     @GET(NetConfig.Game.URL_COLLECT_CARD)
     fun getCollectCard(): Observable<Response<PuzzleEntity?>>
 

library/src/main/java/com/ym/library/net/NetConfig.java

@@ -192,7 +192,7 @@ public class NetConfig {
         public static final String URL_USER_GS_PAGE_INFO = "app/v1/gs/gs_page_info";//用户剩余货币
         public static final String URL_USER_GS_DO_WD = "app/v1/game/msdh/do_wd";//提现
         public static final String URL_USER_GS_COIN2CASH = "app/v1/gs/coin2cash";//金币兑换现金
-        public static final String URL_USER_WD_HISTORY = "app/v1/gs/wd/history";//提现记录
+        public static final String URL_USER_WD_HISTORY = "app/v1/game/msdh/wd_history";//提现记录
         public static final String URL_USER_GS_DO_LOTTERY_WD = "app/v2/game/lottery_wd";//我的抽奖提现
 
     }
@@ -262,6 +262,7 @@ public class NetConfig {
         public static final String URL_GAME_WELFARE_VIDEO_REPORT = "app/v1/game/welfare_video_report";//福利中心看视频任务
         public static final String URL_GAME_WELFARE_TASK_BOX = "app/v1/game/farm/welfare_task_box";//福利中心宝箱领取
         public static final String URL_GAME_WELFARE_TASK_CASH = "app/v1/game/task_cash";//福利中心红包领取
+        public static final String URL_GAME_WELFARE_VIDEO_CD = "app/v1/game/video_cd";//福利中心广告cd
         public static final String URL_COLLECT_CARD = "app/v1/collect-card/list";//宝箱卡片列表
         public static final String URL_COLLECT_CARD_PUT = "app/v1/collect-card/put";//宝箱卡片拼图
         public static final String URL_COLLECT_CARD_ADV = "app/v1/collect-card/adv";//看广告一键拼图

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

@@ -11,6 +11,7 @@ import com.ym.admodule.config.ZXADSizeConfig
 import com.ym.admodule.listener.ZXADVideoListener
 import com.ym.library.listener.IAdVideoListener
 import com.ym.library.module.StatusEntity
+import com.ym.library.net.ApiClient
 import com.ym.library.net.BaseObserver
 import com.ym.library.net.GameApiClient
 import com.ym.library.net.RxSchedulers
@@ -49,7 +50,12 @@ object AdUtils {
                         //预加载
                         loadNextCacheRewardVideoAd(activity)
                         //看视频上报
+                        if (actionName.equals("welfare_task")) {
+                            getVideoAcceleratorsReceive("center_video_cd")
+                        } else {
                             getVideoAcceleratorsReceive();
+                        }
+
                         handler?.removeCallbacksAndMessages(null)
                     }
 
@@ -126,4 +132,19 @@ object AdUtils {
                 }
             })
     }
+
+    //看视频复活上报
+    fun getVideoAcceleratorsReceive(slot:String) {
+        GameApiClient.gameApi.adVideoReport(slot)
+            .compose(RxSchedulers.observableIO2Main())
+            .subscribe(object : BaseObserver<Any>() {
+                override fun onSuccess(result: Any?) {
+
+                }
+
+                override fun onFailure(e: Throwable?, code: String?, errorMsg: String?) {
+
+                }
+            })
+    }
 }
\ No newline at end of file

userinfo/src/main/res/layout/activity_user_info.xml

@@ -430,7 +430,6 @@
                             android:layout_marginBottom="5dp"
                             android:textColor="#663408"
                             android:textSize="16sp"
-                            android:textStyle="bold"
                             tools:text="提现说明" />
 
                         <com.ym.library.widget.MediumBoldTextView