diff --git a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
index f085d39fdb..616f51eadd 100644
--- a/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
+++ b/main-extensions/mogo-module-main-independent/src/main/java/com/zhidao/mogo/module/main/independent/MainIndependentActivity.java
@@ -28,9 +28,16 @@ public class MainIndependentActivity extends MainActivity {
@Override
protected void initViews() {
super.initViews();
+ // 控制层
FrameLayout.LayoutParams entranceParams = ( ( FrameLayout.LayoutParams ) mEntrance.getLayoutParams() );
entranceParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft );
mEntrance.setLayoutParams( entranceParams );
+
+ // 事件面板
+ FrameLayout.LayoutParams eventPanelParams = ( ( FrameLayout.LayoutParams ) mEventPanel.getLayoutParams() );
+ eventPanelParams.leftMargin = getResources().getDimensionPixelSize( R.dimen.module_main_entrance_fragment_container_marginLeft );
+ mEntrance.setLayoutParams( eventPanelParams );
+
mLeftShadowFrame.setVisibility(View.VISIBLE);
mApps.setVisibility( View.GONE );
}
diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
index 0400c22f90..a0952f38de 100644
--- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
+++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/MainActivity.java
@@ -60,8 +60,9 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
// protected View mHeader;
protected View mApps;
protected View mEntrance;
+ protected View mEventPanel;
protected FrameLayout mFloatingLayout;
- protected FrameLayout mCoverUpLayout;
+ protected View mCoverUpLayout;
protected FrameLayout mLeftPanelLayout;
protected View mLeftShadowFrame;
private boolean mIsHomeKeyDown = false;
@@ -79,6 +80,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
// mHeader = findViewById( R.id.module_main_id_header_fragment_container );
mApps = findViewById( R.id.module_main_id_apps_fragment_container );
mEntrance = findViewById( R.id.module_main_id_entrance_fragment_container );
+ mEventPanel = findViewById( R.id.module_main_id_event_panel_fragment_container );
mFloatingLayout = findViewById( R.id.module_main_id_floating_view );
mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame );
mCoverUpLayout = findViewById( R.id.module_main_id_cover_up );
@@ -94,6 +96,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
protected void hideLayout() {
// mHeader.setVisibility( View.GONE );
mEntrance.setVisibility( View.GONE );
+ mEventPanel.setVisibility( View.GONE );
mFloatingLayout.setVisibility( View.GONE );
}
@@ -101,6 +104,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme
protected void showLayout() {
// mHeader.setVisibility( View.VISIBLE );
mEntrance.setVisibility( View.VISIBLE );
+ mEventPanel.setVisibility( View.VISIBLE );
mFloatingLayout.setVisibility( View.VISIBLE );
}
diff --git a/modules/mogo-module-main/src/main/res/drawable-ldpi/mogo_slogan.png b/modules/mogo-module-main/src/main/res/drawable-ldpi/mogo_slogan.png
new file mode 100644
index 0000000000..d577900772
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-ldpi/mogo_slogan.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable-mdpi/mogo_slogan.png b/modules/mogo-module-main/src/main/res/drawable-mdpi/mogo_slogan.png
new file mode 100644
index 0000000000..d577900772
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-mdpi/mogo_slogan.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable-xhdpi/mogo_slogan.png b/modules/mogo-module-main/src/main/res/drawable-xhdpi/mogo_slogan.png
new file mode 100644
index 0000000000..00d5cd14a3
Binary files /dev/null and b/modules/mogo-module-main/src/main/res/drawable-xhdpi/mogo_slogan.png differ
diff --git a/modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_bg.xml b/modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_bg.xml
new file mode 100644
index 0000000000..d78157cb0e
--- /dev/null
+++ b/modules/mogo-module-main/src/main/res/drawable/main_bitmap_splash_bg.xml
@@ -0,0 +1,23 @@
+
+
+
+ -
+
+
+
+
+
+
+ -
+
+
+
\ No newline at end of file
diff --git a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
index bcb2744c24..ce44459946 100644
--- a/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
+++ b/modules/mogo-module-main/src/main/res/layout/module_main_activity_main.xml
@@ -66,13 +66,14 @@
android:layout_width="match_parent"
android:layout_height="match_parent" />
-
+ />
@null
- @null
- @null
- - @drawable/module_main_launcher_bg
+ - @drawable/main_bitmap_splash_bg
- false
- @style/MainAnimation
- @style/noCheckboxStyle
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 5654dd65f0..4a844b9927 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
@@ -4,7 +4,9 @@ import android.content.res.ColorStateList
import android.graphics.Typeface
import android.view.Gravity
import android.view.View
+import android.widget.LinearLayout
import android.widget.TextView
+import androidx.core.content.ContextCompat
import androidx.fragment.app.Fragment
import androidx.viewpager2.widget.ViewPager2
import androidx.viewpager2.widget.ViewPager2.OnPageChangeCallback
@@ -34,11 +36,11 @@ class V2XEventPanelFragment : MvpFragment
val tabView = TextView(context)
diff --git a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
index ea56d33d13..38eab3dec5 100644
--- a/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
+++ b/modules/mogo-module-v2x/src/main/res/layout/module_v2x_event_panel_fragment_event_panel.xml
@@ -5,12 +5,13 @@
android:layout_width="match_parent"
android:layout_height="match_parent">
-
-
+