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 a171708830..d0293f10a1 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 @@ -71,6 +71,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme private View mApps; private View mEntrance; private FrameLayout mFloatingLayout; + private FrameLayout mCoverUpLayout; private View mLeftShadowFrame; private View mTopShadowFrame; @@ -108,6 +109,10 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme trackLastCardShowEvent( ( IMogoModuleProvider ) msg.obj ); break; case MainConstants.MSG_TRACK_CARD_FLIP_EVENT: + trackCardFlipEvent(( IMogoModuleProvider ) msg.obj); + break; + case MainConstants.MSG_HIDE_MAP_COVER_FRAME: + mCoverUpLayout.setVisibility( View.GONE ); break; } } @@ -137,7 +142,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme Message msg = Message.obtain(); msg.what = MainConstants.MSG_TRACK_LAST_CARD_DISPLAY_EVENT; msg.obj = provider; - mMsgHandler.sendMessage(msg ); + mMsgHandler.sendMessage( msg ); mCurrentPosition = position; provider = mCardModulesAdapter.getProvider( mCurrentPosition ); @@ -162,7 +167,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme Message msg = Message.obtain(); msg.what = MainConstants.MSG_TRACK_CARD_FLIP_EVENT; msg.obj = provider; - mMsgHandler.sendMessage(msg ); + mMsgHandler.sendMessage( msg ); } } else if ( state == ViewPager.SCROLL_STATE_IDLE ) { mCardFlipStatus = false; @@ -202,6 +207,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mFloatingLayout = findViewById( R.id.module_main_id_floating_view ); mLeftShadowFrame = findViewById( R.id.module_main_id_map_left_shadow_frame ); mTopShadowFrame = findViewById( R.id.module_main_id_map_top_shadow_frame ); + mCoverUpLayout = findViewById( R.id.module_main_id_cover_up ); WindowViewHandler.init( mFloatingLayout ); } @@ -279,6 +285,7 @@ public class MainActivity extends MvpActivity< MainView, MainPresenter > impleme mMogoModuleHandler.loadModules(); loadContainerModules(); mMsgHandler.sendEmptyMessageDelayed( MainConstants.MSG_LOAD_CARD_MODULES, 5_000L ); + mMsgHandler.sendEmptyMessageDelayed( MainConstants.MSG_HIDE_MAP_COVER_FRAME, 1_000L ); // 显示左边遮罩 mLeftShadowFrame.setVisibility( View.VISIBLE ); diff --git a/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java b/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java index 2128c635bf..cad52a91c9 100644 --- a/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java +++ b/modules/mogo-module-main/src/main/java/com/mogo/module/main/constants/MainConstants.java @@ -27,4 +27,9 @@ public class MainConstants { * 消息:卡片滑动事件 */ public static final int MSG_TRACK_CARD_FLIP_EVENT = 5003; + + /** + * 消息:隐藏地图遮罩(避免地图加载白屏) + */ + public static final int MSG_HIDE_MAP_COVER_FRAME = 5004; } 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 23343b9186..8f0fe91943 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 @@ -89,4 +89,9 @@ android:layout_width="match_parent" android:layout_height="match_parent" /> + \ No newline at end of file diff --git a/modules/mogo-module-share/src/main/res/values/colors.xml b/modules/mogo-module-share/src/main/res/values/colors.xml index d6a88ad3d2..4313d3f44b 100644 --- a/modules/mogo-module-share/src/main/res/values/colors.xml +++ b/modules/mogo-module-share/src/main/res/values/colors.xml @@ -11,6 +11,7 @@ #F8F8F8 #333333 #DADAE2 + #1C1C1C #545362 #99191C25 #666666