Merge branch 'feature/yk_release' into 'release'

feat: 导医入口弹窗bug修复 See merge request app_android_lib/YDL-Component!277

Merge branch 'feature/yk_release' into 'release'
feat: 导医入口弹窗bug修复 See merge request app_android_lib/YDL-Component!277
12a205c6 · 刘鹏 · 7fdac41a · 3295b0ad · 12a205c6
Commit 12a205c6 authored Jul 29, 2022 by 刘鹏
Hide whitespace changes
Inline Side-by-side

Showing with 5 additions and 3 deletions

ConsultAssistantDialogUtils.kt m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt +5 -3

No files found.
--- a/m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
+++ b/m-consultant/src/main/java/com/yidianling/consultant/modular/singlton/ConsultAssistantDialogUtils.kt
@@ -90,9 +90,11 @@ class ConsultAssistantDialogUtils private constructor() {
        origin: String,
        fromActivity: Boolean = false
    ) {
-        consultAssistantDialogFromHomePage?.dismiss()
+        if (!fromActivity){     // 不是咨询师二级列页的时候再所有的dialog dismiss
-        consultAssistantFragmentDialog?.dismiss()
+            consultAssistantDialogFromHomePage?.dismiss()
-        consultAssistantDialogFromMine?.dismiss()
+            consultAssistantFragmentDialog?.dismiss()
+            consultAssistantDialogFromMine?.dismiss()
+        }
        when (origin) {
            "home_index" -> {
                showFromYdlHome(activity)