Merge remote-tracking branch 'origin/dev' into dev

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()
         }

modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_share_description.xml

@@ -108,7 +108,8 @@
             <com.mogo.module.common.view.CustomRatingBar
                 android:id="@+id/rating_bar"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content" />
+                android:layout_height="wrap_content"
+                app:OtherHeartImg="false" />
 
             <TextView
                 android:id="@+id/share_index_des"