|
|
@@ -144,34 +144,12 @@ class CategoryFragment : BaseFragment(R.layout.fragment_category) {
|
|
|
|
|
|
override fun observeViewModel() {
|
|
|
super.observeViewModel()
|
|
|
- categoryViewModel?.allCategoryLD?.observe(viewLifecycleOwner) {
|
|
|
- val onlineList = mutableListOf<PlaymateCategoryData>()
|
|
|
- val activityList = mutableListOf<PlaymateCategoryData>()
|
|
|
- for (entry in it) {
|
|
|
- if (entry.isActivity()) {
|
|
|
- activityList.add(entry)
|
|
|
- } else {
|
|
|
- onlineList.add(entry)
|
|
|
- }
|
|
|
- }
|
|
|
+ categoryViewModel?.allCategoryLD?.observe(viewLifecycleOwner) {categoryList->
|
|
|
val titleList = mutableListOf<CategoryListTitleData>()
|
|
|
val itemList = mutableListOf<CategoryItemData>()
|
|
|
|
|
|
var titlePosition = -1
|
|
|
- for (data in onlineList) {
|
|
|
- titlePosition++
|
|
|
- titleList.add(CategoryListTitleData(data))
|
|
|
-
|
|
|
- itemToTitlePosition.add(titlePosition)
|
|
|
- itemList.add(CategoryListTitleData(data))
|
|
|
-
|
|
|
- titleToItemPosition.add(itemList.size + 1)
|
|
|
- for (subData in data.subCategoryList) {
|
|
|
- itemToTitlePosition.add(titlePosition)
|
|
|
- itemList.add(CategoryListItemData(data.code, subData))
|
|
|
- }
|
|
|
- }
|
|
|
- for (data in activityList) {
|
|
|
+ for (data in categoryList) {
|
|
|
titlePosition++
|
|
|
titleList.add(CategoryListTitleData(data))
|
|
|
|