From 18152b740712558264d2a1e8491c7e9107267de3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E8=91=A3=E5=AE=8F=E5=AE=87?= <martindhy@gmail.com>
Date: Wed, 25 Nov 2020 18:22:31 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=B3=E9=97=ADM1=E4=B8=AD=E7=9A=84=E4=BA=8B?=
 =?UTF-8?q?=E4=BB=B6=E9=9D=A2=E6=9D=BF=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../v2x/fragment/V2XEventPanelFragment.kt     | 23 +++++++++++--------
 1 file changed, 14 insertions(+), 9 deletions(-)

diff --git a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
index 3eb198c1d0..e2b0777839 100644
--- a/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
+++ b/modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
@@ -227,15 +227,20 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
                     }
                 }
             }
-            val x = resources.getDimensionPixelSize(if (DebugConfig.isLauncher()) {
-                R.dimen.module_v2x_event_panel_in_launcher_btn_x
-            } else {
-                R.dimen.module_v2x_event_panel_btn_x
-            })
-            val y = resources.getDimensionPixelSize(R.dimen.module_v2x_event_panel_btn_y)
-            V2XServiceManager.getMogoEntranceButtonController()
-                    .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
-            changeEventCount()
+
+            // M1 不基于地图的版本直接展示事件面板，且不可关闭
+            if (DebugConfig.isMapBased()) {
+                val x = resources.getDimensionPixelSize(if (DebugConfig.isLauncher()) {
+                    R.dimen.module_v2x_event_panel_in_launcher_btn_x
+                } else {
+                    R.dimen.module_v2x_event_panel_btn_x
+                })
+                val y = resources.getDimensionPixelSize(R.dimen.module_v2x_event_panel_btn_y)
+                V2XServiceManager.getMogoEntranceButtonController()
+                        .addBottomLayerView(mV2XEventPanelHistoryCountView, x, y)
+                changeEventCount()
+            }
+
         } catch (e: Exception) {
             e.printStackTrace()
         }