bug优化

video/app/build.gradle

@@ -12,8 +12,8 @@ android {
         applicationId "com.duben.dayplaylet"
         minSdkVersion rootProject.ext.androidMinSdkVersion
         targetSdkVersion rootProject.ext.androidTargetSdkVersion
-        versionCode 2
-        versionName "1.0.1"
+        versionCode 3
+        versionName "1.0.2"
         flavorDimensions "default"
 
         // dex突破65535的限制

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

@@ -2,6 +2,7 @@ package com.duben.dayplaylet.ad.video;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.bytedance.sdk.openadsdk.AdSlot;
 import com.bytedance.sdk.openadsdk.TTAdConstant;
@@ -56,6 +57,7 @@ public class InMoneyVideo {
     private WeakReference<Activity> weakActivity;
 
     private boolean isPreLoad = false;//是否是预加载调用，需要躲避监听
+    private boolean isRewardValid = false;
 
     private AdStatusListener adStatusListener;
 
@@ -186,6 +188,8 @@ public class InMoneyVideo {
     private final TTRewardVideoAd.RewardAdInteractionListener mTTRewardedAdListener = new TTRewardVideoAd.RewardAdInteractionListener() {
         @Override
         public void onAdShow() {
+            isRewardValid = false;
+
             if (mttRewardAd != null && mttRewardAd.getMediationManager().getShowEcpm() != null) {
                 HashMap<String, Object> vo = new HashMap<>();
                 vo.put("adcode", mttRewardAd.getMediationManager().getShowEcpm().getSlotId());
@@ -218,11 +222,12 @@ public class InMoneyVideo {
             HashMap<String, Object> vo = new HashMap<>();
             vo.put("carrierType", carrierType);
             vo.put("ecpmId", AppConfig.gromoreId);
+            vo.put("isRewardValid", isRewardValid);
             if (AppConfig.taskListId != -1) {
                 vo.put("list_id", AppConfig.taskListId);
             }
 
-            if (!isNoReportCarrier(carrierType)) {
+            if (!isNoReportCarrier(carrierType)&&isRewardValidForCarrier(carrierType)) {
                 TrackManager.getInstance().reportAddCoinMsg(vo);
             }
 
@@ -253,8 +258,10 @@ public class InMoneyVideo {
         }
 
         @Override
-        public void onRewardArrived(boolean b, int i, Bundle bundle) {
-
+        public void onRewardArrived(boolean isReward, int i, Bundle bundle) {
+            //奖励是否发放请依据isRewardValid
+            LogUtil.e(TAG, "gromore预加载 激励视频广告-->onRewardArrived   奖励是否发放请依据isRewardValid=" + isRewardValid);
+            isRewardValid = isReward;
         }
 
         @Override
@@ -274,4 +281,15 @@ public class InMoneyVideo {
         return strings.contains(carrierType);
     }
 
+    private boolean isRewardValidForCarrier(String carrierType) {
+        if (!isRewardValid) {
+            if (TextUtils.equals(carrierType, Constant.CARRIERTYPE_TASK_YUANBAO) ||
+                    TextUtils.equals(carrierType, Constant.CARRIERTYPE_REWARD_COIN) ||
+                    TextUtils.equals(carrierType, Constant.CARRIERTYPE_REWARD_DI)
+            ) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

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

@@ -2,6 +2,7 @@ package com.duben.dayplaylet.ad.video;
 
 import android.app.Activity;
 import android.os.Bundle;
+import android.text.TextUtils;
 
 import com.bytedance.sdk.openadsdk.AdSlot;
 import com.bytedance.sdk.openadsdk.TTAdConstant;
@@ -45,6 +46,7 @@ public class InMoneyVideoNoPre {
     }
 
     private String carrierType = "";
+    private boolean isRewardValid = false;
 
     private TTRewardVideoAd mttRewardAd;
 
@@ -121,6 +123,8 @@ public class InMoneyVideoNoPre {
     private final TTRewardVideoAd.RewardAdInteractionListener mTTRewardedAdListener = new TTRewardVideoAd.RewardAdInteractionListener() {
         @Override
         public void onAdShow() {
+            isRewardValid = false;
+
             if (adStatusListener != null) {
                 adStatusListener.adSuccess();
             }
@@ -157,12 +161,13 @@ public class InMoneyVideoNoPre {
             HashMap<String, Object> vo = new HashMap<>();
             vo.put("carrierType", carrierType);
             vo.put("ecpmId", AppConfig.gromoreId);
+            vo.put("isRewardValid", isRewardValid);
             if (AppConfig.taskListId != -1) {
                 vo.put("list_id", AppConfig.taskListId);
             }
 
 
-            if (!isNoReportCarrier(carrierType)) {
+            if (!isNoReportCarrier(carrierType) && isRewardValidForCarrier(carrierType)) {
                 TrackManager.getInstance().reportAddCoinMsg(vo);
             }
 
@@ -192,8 +197,10 @@ public class InMoneyVideoNoPre {
         }
 
         @Override
-        public void onRewardArrived(boolean b, int i, Bundle bundle) {
-
+        public void onRewardArrived(boolean isReward, int i, Bundle bundle) {
+            //奖励是否发放请依据isRewardValid
+            LogUtil.e(TAG, "gromore实时加载 激励视频广告-->onRewardArrived   奖励是否发放请依据isRewardValid=" + isRewardValid);
+            isRewardValid = isReward;
         }
 
         @Override
@@ -213,4 +220,15 @@ public class InMoneyVideoNoPre {
         return strings.contains(carrierType);
     }
 
+    private boolean isRewardValidForCarrier(String carrierType) {
+        if (!isRewardValid) {
+            if (TextUtils.equals(carrierType, Constant.CARRIERTYPE_TASK_YUANBAO) ||
+                    TextUtils.equals(carrierType, Constant.CARRIERTYPE_REWARD_COIN) ||
+                    TextUtils.equals(carrierType, Constant.CARRIERTYPE_REWARD_DI)
+            ) {
+                return false;
+            }
+        }
+        return true;
+    }
 }

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

@@ -25,7 +25,7 @@ object Constant {
     const val CARRIERTYPE_SIGN = "FORCASH_SIGN" //签到
     const val CARRIERTYPE_SIGN_DRAW = "FORCASH_SIGN_MORE" //签到第二次提现
     const val CARRIERTYPE_SIGN_7 = "FORCASH_SIGN_AFTER7" //签到7天后的视频
-    const val CARRIERTYPE_TASK_YUANBAO = "REWARD_DI" //签到7天后的视频
+    const val CARRIERTYPE_TASK_YUANBAO = "REWARD_DI" //个人中心元宝
     const val CARRIERTYPE_REWARD_COIN = "REWARD_COIN" //红包提现页
     const val CARRIERTYPE_REWARD_DI = "REWARD_DI" //元宝提现页
     const val CARRIERTYPE_ONLY_SHOW = "ONLY_SHOW" //白嫖

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

@@ -46,6 +46,14 @@ class DrawProgressActivity : BaseActivity(), View.OnClickListener {
         }
     }
 
+    override fun onResume() {
+        super.onResume()
+
+        if (tempAdProgress >= max) {
+            finish()
+        }
+    }
+
     override fun initViewsAndEvents() {
         tv_draw_progress_count.text = SpanUtils()
             .append(progress.toString())
@@ -127,13 +135,13 @@ class DrawProgressActivity : BaseActivity(), View.OnClickListener {
 
                             override fun adClose(vo: HashMap<String, Any>?) {
                                 hideLoading()
-                                adCloseNext(carrierType)
+                                adCloseNext(carrierType, vo?.get("isRewardValid") as Boolean)
                             }
                         })
                 }
 
                 override fun adClose(vo: HashMap<String, Any>?) {
-                    adCloseNext(carrierType)
+                    adCloseNext(carrierType, vo?.get("isRewardValid") as Boolean)
                 }
             })
     }
@@ -141,11 +149,13 @@ class DrawProgressActivity : BaseActivity(), View.OnClickListener {
     /**
      * 点击关闭广告
      */
-    private fun adCloseNext(carrierType: String) {
-        tempAdProgress = tempAdProgress + 1
+    private fun adCloseNext(carrierType: String, isRewardValid: Boolean) {
+        if (isRewardValid) {
+            tempAdProgress = tempAdProgress + 1
+        }
 
         Handler(Looper.getMainLooper()).postDelayed({
-            if(isFinishing) return@postDelayed
+            if (isFinishing) return@postDelayed
 
             val showProgress = progress + tempAdProgress
             pb_draw_progress.progress = showProgress

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

@@ -245,7 +245,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
                             }
                             isSignDrawFlag = false
                         }, 3500)
-                    }, 1500)
+                    }, 3000)
                 }, 300)
             }
             Constant.CARRIERTYPE_SIGN_DRAW -> {
@@ -259,7 +259,7 @@ class MainFragment : LazyLoadBaseFragment(), HomeView, View.OnClickListener, OnR
                         // 2、第二次展示签到余额
                         drawAlipayDialog?.dismiss()
                         showSignDrawDialog(1)
-                    }, 1500)
+                    }, 3000)
                 }, 300)
             }
         }

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

@@ -170,6 +170,8 @@ class MovieFragment : LazyLoadBaseFragment(), PicContentView, OnLoadMoreListener
         var insertIndex = 3
 
         val allData = hotStyleAdapter.data
+        if (allData.size == 0) return
+
         for (i in allData.size - 1 downTo 0) {
             if (allData[i].itemType == MULTI_ITEM_3) {
                 insertIndex += 4