CPD模块逻辑优化

eb7e8f16 · jyx · 5e1e1257 · eb7e8f16
Commit eb7e8f16 authored Mar 12, 2021 by jyx
Hide whitespace changes
Inline Side-by-side

Showing with 31 additions and 11 deletions

TaskCpdFragment.kt ...ain/java/com/wenshu/youyou/ui/fragment/TaskCpdFragment.kt +31 -11

No files found.
--- a/app/src/main/java/com/wenshu/youyou/ui/fragment/TaskCpdFragment.kt
+++ b/app/src/main/java/com/wenshu/youyou/ui/fragment/TaskCpdFragment.kt
@@ -168,19 +168,39 @@ class TaskCpdFragment : BaseFragment(), TaskView,
        }
        // 珊瑚和CPD展示顺序
-        if (CPD_ORDER == "CPD_SYD") {
+        when (CPD_ORDER) {
-            if (cpdMax > 0) {
+            "CPD_SYD" -> {
-                // 拉取数组数据
+                when {
-//                loadCPDDataList()
+                    cpdMax > 0 -> {
-                // 循环拉取数据
+                        // 拉取数组数据
-                loadCPDDataCycle()
+//                        loadCPDDataList()
+                        // 循环拉取数据
+                        loadCPDDataCycle()
+                    }
+                    shMax > 0 -> {
+                        loadShDataList()
+                    }
+                    else -> {
+                        notifyDataAndShowAd()
+                    }
+                }
            }
-        } else if (CPD_ORDER == "CPD_SH") {
+            "CPD_SH" -> {
-            if (shMax > 0) {
+                when {
-                loadShDataList()
+                    shMax > 0 -> {
+                        loadShDataList()
+                    }
+                    cpdMax > 0 -> {
+                        loadCPDDataCycle()
+                    }
+                    else -> {
+                        notifyDataAndShowAd()
+                    }
+                }
+            }
+            else -> {
+                notifyDataAndShowAd()
            }
-        } else {
-            notifyDataAndShowAd()
        }
    }