CPD取值错误代码修复

GoodMoney/app/src/main/java/com/mints/goodmoney/ui/fragment/TaskCpdFragment.kt

@@ -70,6 +70,8 @@ class TaskCpdFragment : BaseFragment(), TaskView,
     // 圣于地第二次拉取重复不拉取
 //    private var isTwiceGetCpd = false
 
+    // 圣于地是否是List请求 TODO
+
     private val outNetIp by lazy { SPUtil.getInstance().getString(Constant.OUT_NET_IP) }
 
     private var mCoin = 0
@@ -146,8 +148,9 @@ class TaskCpdFragment : BaseFragment(), TaskView,
             hideLoading()
 //            showToast("今日任务已完成,请明日再试")
 
-            // 跳转试玩任务
             notifyDataAndShowAd()
+
+            // 跳转试玩任务
             if (AppConfig.useAppCpdModelShow) {
                 (activity as TaskCpdActivity).selectTwoFragment()
             }
@@ -225,7 +228,12 @@ class TaskCpdFragment : BaseFragment(), TaskView,
         // 圣于地广告 循环完成后去重
         if (cpdLoadCountTime++ >= cpdMax - 1) {
 
+            if (shMax == 0 || shLoadCountTime >= shMax) {
                 getCpdRepeatPkg()
+            } else {
+                // 圣于地拉取完成后 调用珊瑚广告
+                loadShDataList()
+            }
         }
 
         LogUtil.d(TAG, "syd getCpdModelSuc $cpdLoadCountTime")
@@ -236,10 +244,9 @@ class TaskCpdFragment : BaseFragment(), TaskView,
         LogUtil.d(TAG, "syd getCpdModelFail")
 
         if (cpdLoadCountTime++ >= cpdMax - 1) {
-            getCpdRepeatPkg()
 
             if (shMax == 0 || shLoadCountTime >= shMax) {
-                notifyDataAndShowAd()
+                getCpdRepeatPkg()
             } else {
                 // 圣于地拉取完成后 调用珊瑚广告
                 loadShDataList()
@@ -267,11 +274,9 @@ class TaskCpdFragment : BaseFragment(), TaskView,
             mFakeTaskList.add(tzTaskBean)
         }
 
+        if (shMax == 0 || shLoadCountTime >= shMax) {
             // 圣于地广告 循环完成后去重
             getCpdRepeatPkg()
-
-        if (shMax == 0 || shLoadCountTime >= shMax) {
-            notifyDataAndShowAd()
         } else {
             cpdLoadCountTime = cpdMax
 
@@ -310,6 +315,7 @@ class TaskCpdFragment : BaseFragment(), TaskView,
                         newPkgData.add(oldTaskBean)
                     } else {
                         for (newTaskBean in newPkgData) {
+                            LogUtil.d(newTaskBean.title)
                             if (!newTaskBean.isShCpd && !oldTaskBean.isShCpd) {
                                 flag = newTaskBean.downLoadPkgName == oldTaskBean.downLoadPkgName
                             }
@@ -358,14 +364,7 @@ class TaskCpdFragment : BaseFragment(), TaskView,
                 mFakeTaskList.clear()
                 mFakeTaskList.addAll(t)
 
-                if (shMax == 0 || shLoadCountTime >= shMax) {
                 notifyDataAndShowAd()
-                } else {
-                    // 圣于地拉取完成后 调用珊瑚广告
-                    loadShDataList()
-                }
-
-//                notifyDataAndShowAd()
 
                 // 重新获取数据
 //                if (cpdLoadCountTime in 1..cpdMax) {
@@ -378,7 +377,6 @@ class TaskCpdFragment : BaseFragment(), TaskView,
 //                } else {
 //                    notifyDataAndShowAd()
 //                }
-
             }
         })
     }
@@ -402,10 +400,12 @@ class TaskCpdFragment : BaseFragment(), TaskView,
      * 上报圣于地展示
      */
     private fun uploadSydImp() {
+
         for (tzTaskBean in mFakeTaskList) {
             if (!tzTaskBean.isShCpd) {
 
-                val trackerBean = tzTaskBean.trackerBean
+                val trackerBean = tzTaskBean.trackerListBean
+//                val trackerBean = tzTaskBean.trackerBean
                 if (trackerBean != null) {
                     LogUtil.d("CPD -> show")