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

Merge branch 'qa_1.1.8' into qa_1.1.8_easy_mode

Browse Source 
# Conflicts:
#	modules/mogo-module-v2x/src/main/res/drawable/bg_v2x_event_description.xml
#	skin/mogo-skin-light/src/main/module-v2x-res/drawable/bg_v2x_event_description_light.xml
This commit is contained in:
董宏宇
2020-11-30 18:03:47 +08:00
parent 88f11053a1 6b58a86040
commit 5d62028b2e
23 changed files with 17 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
modules/mogo-module-v2x/src/main/java/com/mogo/module/v2x/V2XEventPanelModuleProvider.java
View File

@@ -98,22 +98,16 @@ public class V2XEventPanelModuleProvider implements
@Override
public void showPanelWithSelectedItem(int item) {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
}
V2XEventPanelFragment.Companion.getInstance().showPanelWithSelectedItem(item);
}
@Override
public void showPanel() {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().showPanel();
}
V2XEventPanelFragment.Companion.getInstance().showPanel();
}
@Override
public void hidePanel() {
if (!V2XServiceManager.getMoGoStatusManager().isMainPageIsBackground()) {
V2XEventPanelFragment.Companion.getInstance().hidePanel();
}
V2XEventPanelFragment.Companion.getInstance().hidePanel();
}
}