CPD模块逻辑优化

app/src/main/java/com/wenshu/youyou/ui/fragment/TaskCpdFragment.kt

@@ -168,21 +168,41 @@ class TaskCpdFragment : BaseFragment(), TaskView,
         }
 
         // 珊瑚和CPD展示顺序
-        if (CPD_ORDER == "CPD_SYD") {
-            if (cpdMax > 0) {
+        when (CPD_ORDER) {
+            "CPD_SYD" -> {
+                when {
+                    cpdMax > 0 -> {
                         // 拉取数组数据
 //                        loadCPDDataList()
                         // 循环拉取数据
                         loadCPDDataCycle()
                     }
-        } else if (CPD_ORDER == "CPD_SH") {
-            if (shMax > 0) {
+                    shMax > 0 -> {
                         loadShDataList()
                     }
-        } else {
+                    else -> {
+                        notifyDataAndShowAd()
+                    }
+                }
+            }
+            "CPD_SH" -> {
+                when {
+                    shMax > 0 -> {
+                        loadShDataList()
+                    }
+                    cpdMax > 0 -> {
+                        loadCPDDataCycle()
+                    }
+                    else -> {
                         notifyDataAndShowAd()
                     }
                 }
+            }
+            else -> {
+                notifyDataAndShowAd()
+            }
+        }
+    }
 
     private fun loadShDataList() {
         // 珊瑚CPD广告拉取