yangyakun921/MoGoEagleEye
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'jo' into dev

Browse Source
This commit is contained in:
liujing
2020-11-17 14:03:49 +08:00
parent f19c407b82 eacb562105
commit 450cc882ca
3 changed files with 9 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
View File

@@ -57,10 +57,10 @@
android:layout_width="match_parent"
android:layout_height="match_parent"
android:layout_marginLeft="@dimen/module_main_id_entrance_fragment_container_marginLeft"
android:paddingLeft="@dimen/module_main_apps_fragment_container_padding"
android:paddingRight="@dimen/module_main_apps_fragment_container_padding"
android:paddingTop="@dimen/module_main_apps_fragment_container_paddingTop"
android:paddingBottom="@dimen/module_main_apps_fragment_container_paddingTop" />
android:paddingLeft="@dimen/module_main_event_panel_fragment_paddingLeft"
android:paddingRight="@dimen/module_main_event_panel_fragment_paddingRight"
android:paddingTop="@dimen/module_main_event_panel_fragment_paddingTop"
android:paddingBottom="@dimen/module_main_event_panel_fragment_paddingBottom" />
<FrameLayout
android:id="@+id/module_main_id_message_history_fragment_container"

5
modules/mogo-module-main/src/main/res/values/dimens.xml
View File

@@ -30,4 +30,9 @@
<dimen name="module_main_apps_fragment_container_paddingBottom">2px</dimen>
<dimen name="module_ext_top_view_max_width">1920px</dimen>
<dimen name="module_main_panel_margin_right">0px</dimen>
<!--事件面板-->
<dimen name="module_main_event_panel_fragment_paddingTop">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingBottom">2px</dimen>
<dimen name="module_main_event_panel_fragment_paddingLeft">0px</dimen>
<dimen name="module_main_event_panel_fragment_paddingRight">0px</dimen>
</resources>

1
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/fragment/V2XEventPanelFragment.kt
View File

@@ -52,7 +52,6 @@ class V2XEventPanelFragment : MvpFragment<V2XEventPanelFragment, EventPanelPrese
private var mRbScenarioHistory: RadioButton? = null
private var mRbSurroundingEvent: RadioButton? = null
private var mRbShareEvents: RadioButton? = null
private var todayFirstForShared: String? = ""
private val mV2XScenarioHistoryFragment = V2XScenarioHistoryFragment()
private val mV2XShareEventsFragment = V2XShareEventsFragment()