Browse Source

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

江天明 2 years ago
parent
commit
aa0d5d8171

BIN
BusinessCommon/src/main/res/drawable-xxxhdpi/ic_search.webp


+ 15 - 0
BusinessMain/src/main/java/com/develop/main/ui/RecipesFragment.kt

@@ -1,6 +1,7 @@
 package com.develop.main.ui
 
 
+import android.media.metrics.Event
 import android.os.Bundle
 import android.util.SparseIntArray
 import android.view.LayoutInflater
@@ -18,6 +19,7 @@ import com.develop.base.widgets.CommonPopupWindow
 import com.develop.common.data_repo.db.*
 import com.develop.common.data_repo.db.entity.DevRecipeCategory
 import com.develop.common.databinding.FragmentCommeListBinding
+import com.develop.common.event.RefreshDataEvent
 import com.develop.common.router.Screens
 import com.develop.common.tag.*
 import com.develop.common.ui.CommonBVMFragment
@@ -30,6 +32,8 @@ import com.drake.brv.utils.grid
 import com.drake.brv.utils.linear
 import com.drake.brv.utils.models
 import com.drake.brv.utils.setup
+import org.greenrobot.eventbus.EventBus
+import org.greenrobot.eventbus.Subscribe
 
 class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewModel>() {
 
@@ -94,6 +98,7 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
     override fun createViewBinding(
         inflater: LayoutInflater, container: ViewGroup?
     ): FragmentCommeListBinding {
+        EventBus.getDefault().register(this)
         return FragmentCommeListBinding.inflate(inflater, container, false)
     }
 
@@ -104,6 +109,11 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         refreshOnLineOrLocalRecipes()
     }
 
+    override fun onDestroy() {
+        super.onDestroy()
+        EventBus.getDefault().unregister(this)
+    }
+
     private fun initView() {
         sortDataList.addAll(DataFactory.genSortNameList(resources))
 
@@ -481,4 +491,9 @@ class RecipesFragment : CommonBVMFragment<FragmentCommeListBinding, HomeViewMode
         var checkedColor = com.develop.common.R.color.color_F4A12E
         var unCheckedColor = com.develop.common.R.color.color_6B6B6B
     }
+
+    @Subscribe
+    fun refreshRecipes(event:RefreshDataEvent) {
+        refreshOnLineOrLocalRecipes()
+    }
 }

+ 6 - 3
BusinessStep/src/main/java/com/develop/step/ui/recipes_detail/CookDetailActivity.kt

@@ -22,11 +22,13 @@ import com.develop.common.ui.CommonBVMActivity
 import com.develop.common.utils.Resource
 import com.develop.common.dialog.DownloadFailedDialog
 import com.develop.common.dialog.ShareQRCodeDialog
+import com.develop.common.event.RefreshDataEvent
 import com.develop.step.databinding.ActivityCookDetailBinding
 import com.develop.step.viewmodel.CookDetailViewModel
 import java.util.*
 import com.develop.step.R
 import com.develop.step.ui.recipes_detail.model.CookDetailInfo
+import org.greenrobot.eventbus.EventBus
 
 @Route(path = Screens.Cook.COOK_DETAIL)
 class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDetailViewModel>() {
@@ -209,7 +211,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
             binding.clFuncMore.setGone()
             shareQRCodeDialog.apply {
                 recipeNum = number
-                showDialog(supportFragmentManager,"ShareQRCodeDialog")
+                showDialog(supportFragmentManager, "ShareQRCodeDialog")
             }
         }
         binding.viewServing.setOnClickListener {
@@ -317,7 +319,7 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                 binding.viewProgress.setProgress(1f)
                 binding.viewProgress.setButtonColor(Color.parseColor("#CC1EABDB"))
                 binding.viewIcon.setImageResource(com.develop.common.R.drawable.ic_detail_cook_download)
-                downloadFileDialog.showDialog(supportFragmentManager,"DownloadFailedDialog")
+                downloadFileDialog.showDialog(supportFragmentManager, "DownloadFailedDialog")
             }
             Resource.Status.LOADING -> {
                 val updateProgress = "${resource.data}%"
@@ -367,13 +369,14 @@ class CookDetailActivity : CommonBVMActivity<ActivityCookDetailBinding, CookDeta
                         .removeOnlineRecipe(
                             CURRENT_USER_ID, recipe.number ?: ""
                         )
+                    EventBus.getDefault().post(RefreshDataEvent())
                     runOnUiThread {
                         finish()
                     }
                 }
             })
         }
-        dialog.showDialog(supportFragmentManager,"RecipeDeleteConfirmDialog")
+        dialog.showDialog(supportFragmentManager, "RecipeDeleteConfirmDialog")
     }
 
     companion object {