Browse Source

提交人:jtm
提交内容:bug fix

江天明 2 years ago
parent
commit
181f8a9d10

+ 24 - 1
BusinessCommon/src/main/java/com/develop/common/data_repo/db/DataFactory.kt

@@ -209,6 +209,16 @@ object DataFactory {
                         return@Comparator -1
                     }
                 }
+                SortedType.A2Z -> {
+                    val score1 = t.name?.compareTo(t2.name ?: "") ?: 0
+                    if (score1 > 0) {
+                        return@Comparator 1
+                    } else if (score1 == 0) {
+                        return@Comparator 0
+                    } else {
+                        return@Comparator -1
+                    }
+                }
             }
         })
         val foodList = mutableListOf<FoodContentModel>()
@@ -237,7 +247,10 @@ object DataFactory {
     fun genSortNameList(resource: Resources): MutableList<FilterSortModel> {
         val result = mutableListOf<FilterSortModel>()
         val sortNameList = mutableListOf(
-            resource.getString(R.string.most_popular), resource.getString(R.string.newest), "rating"
+            resource.getString(R.string.most_popular),
+            resource.getString(R.string.newest),
+            "rating",
+            "A-Z"
         )
         for (name in sortNameList) {
             result.add(FilterSortModel(name))
@@ -309,6 +322,16 @@ object DataFactory {
                         return@Comparator -1
                     }
                 }
+                SortedType.A2Z -> {
+                    val score1 = t.name?.compareTo(t2.name ?: "") ?: 0
+                    if (score1 > 0) {
+                        return@Comparator 1
+                    } else if (score1 == 0) {
+                        return@Comparator 0
+                    } else {
+                        return@Comparator -1
+                    }
+                }
             }
         })
         val foodList = mutableListOf<FoodContentModel>()

+ 2 - 1
BusinessCommon/src/main/java/com/develop/common/data_repo/db/ModelKit.kt

@@ -75,7 +75,8 @@ enum class CategoryType {
 enum class SortedType {
     Popular,
     Newest,
-    Score
+    Score,
+    A2Z
 }
 
 enum class RecipesType {

+ 4 - 1
BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -447,6 +447,9 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
             2 -> {
                 SortedType.Score
             }
+            3 -> {
+                SortedType.A2Z
+            }
             else -> {
                 SortedType.Popular
             }
@@ -493,7 +496,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     }
 
     @Subscribe
-    fun refreshRecipes(event:RefreshDataEvent) {
+    fun refreshRecipes(event: RefreshDataEvent) {
         refreshOnLineOrLocalRecipes()
     }
 }