Browse Source

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

江天明 1 year ago
parent
commit
d07f067072

+ 3 - 3
BusinessCommon/src/main/java/com/develop/common/dialog/RecipeUpdateDialog.kt

@@ -20,7 +20,7 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
 
     lateinit var binding: DialogRecipeUpdateBinding
 
-    lateinit var onDialogClickListener: OnDialogClickListener
+     var onDialogClickListener: OnDialogClickListener?=null
 
     var type = "UPDATE_TIPS";
 
@@ -34,12 +34,12 @@ class RecipeUpdateDialog() : FullScreenTransparentDialog() {
         )
 
         binding.tvYes.setOnClickListener {
-            onDialogClickListener.onConfirm()
+            onDialogClickListener?.onConfirm()
             removeSelf()
         }
 
         binding.tvCancel.setOnClickListener {
-            onDialogClickListener.onCancel()
+            onDialogClickListener?.onCancel()
             removeSelf()
         }
 

+ 3 - 1
BusinessStep/src/main/java/com/develop/step/viewmodel/CookStepViewModel.kt

@@ -39,7 +39,9 @@ class CookStepViewModel : BaseViewModel() {
         FoodDataProvider.getDatabase().runInTransaction {
             allSteps.clear()
             recipe =  FoodDataProvider.getDatabase().recipeDao().queryRecipe(number)
-            recipeLiveData.postValue(recipe)
+            recipe?.apply {
+                recipeLiveData.postValue(this)
+            }
             val cookSteps = FoodDataProvider
                 .getDatabase()
                 .recipeDao()