diff --git a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java index f67fa10..a850521 100644 --- a/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java +++ b/TMessagesProj/src/main/java/org/telegram/ui/LaunchActivity.java @@ -468,7 +468,10 @@ if (actionBarLayout.fragmentsStack.isEmpty()) { if (!UserConfig.isClientActivated()) { + Log.e("aaaaa", "login 11111"); actionBarLayout.addFragmentToStack(new LoginActivity()); + //覆盖一层登录页2 + actionBarLayout.addFragmentToStack(new Login2Activity()); drawerLayoutContainer.setAllowOpenDrawer(false, false); } else { DialogsActivity dialogsActivity = new DialogsActivity(null); @@ -549,10 +552,12 @@ boolean allowOpen = true; if (AndroidUtilities.isTablet()) { allowOpen = actionBarLayout.fragmentsStack.size() <= 1 && layersActionBarLayout.fragmentsStack.isEmpty(); + Log.e("aaaaa", "login 2222"); if (layersActionBarLayout.fragmentsStack.size() == 1 && layersActionBarLayout.fragmentsStack.get(0) instanceof LoginActivity) { allowOpen = false; } } + Log.e("aaaaa", "login 3333"); if (actionBarLayout.fragmentsStack.size() == 1 && actionBarLayout.fragmentsStack.get(0) instanceof LoginActivity) { allowOpen = false; } @@ -1304,7 +1309,9 @@ if (AndroidUtilities.isTablet()) { if (!UserConfig.isClientActivated()) { if (layersActionBarLayout.fragmentsStack.isEmpty()) { + Log.e("aaaaa", "login 44444"); layersActionBarLayout.addFragmentToStack(new LoginActivity()); + layersActionBarLayout.addFragmentToStack(new Login2Activity()); drawerLayoutContainer.setAllowOpenDrawer(false, false); } } else { @@ -1318,7 +1325,9 @@ } else { if (actionBarLayout.fragmentsStack.isEmpty()) { if (!UserConfig.isClientActivated()) { + Log.e("aaaaa", "login 4444"); actionBarLayout.addFragmentToStack(new LoginActivity()); + actionBarLayout.addFragmentToStack(new Login2Activity()); drawerLayoutContainer.setAllowOpenDrawer(false, false); } else { DialogsActivity dialogsActivity = new DialogsActivity(null); @@ -2681,6 +2690,7 @@ ArticleViewer.getInstance().close(false, true); } if (AndroidUtilities.isTablet()) { + Log.e("aaaaa", "login 777777"); drawerLayoutContainer.setAllowOpenDrawer(!(fragment instanceof LoginActivity || fragment instanceof CountrySelectActivity) && layersActionBarLayout.getVisibility() != View.VISIBLE, true); if (fragment instanceof DialogsActivity) { DialogsActivity dialogsActivity = (DialogsActivity) fragment; @@ -2750,6 +2760,7 @@ } else if (layout != layersActionBarLayout) { layersActionBarLayout.setVisibility(View.VISIBLE); drawerLayoutContainer.setAllowOpenDrawer(false, true); + Log.e("aaaaa", "login 8888"); if (fragment instanceof LoginActivity) { backgroundTablet.setVisibility(View.VISIBLE); shadowTabletSide.setVisibility(View.GONE); @@ -2762,6 +2773,7 @@ } return true; } else { + Log.e("aaaaa", "login 999999"); drawerLayoutContainer.setAllowOpenDrawer(!(fragment instanceof LoginActivity || fragment instanceof CountrySelectActivity), false); return true; } @@ -2770,6 +2782,7 @@ @Override public boolean needAddFragmentToStack(BaseFragment fragment, ActionBarLayout layout) { if (AndroidUtilities.isTablet()) { + Log.e("aaaaa", "login aaaaaa"); drawerLayoutContainer.setAllowOpenDrawer(!(fragment instanceof LoginActivity || fragment instanceof CountrySelectActivity) && layersActionBarLayout.getVisibility() != View.VISIBLE, true); if (fragment instanceof DialogsActivity) { DialogsActivity dialogsActivity = (DialogsActivity) fragment; @@ -2815,6 +2828,7 @@ } else if (layout != layersActionBarLayout) { layersActionBarLayout.setVisibility(View.VISIBLE); drawerLayoutContainer.setAllowOpenDrawer(false, true); + Log.e("aaaaa", "login bbbbbb"); if (fragment instanceof LoginActivity) { backgroundTablet.setVisibility(View.VISIBLE); shadowTabletSide.setVisibility(View.GONE); @@ -2827,6 +2841,7 @@ } return true; } else { + Log.e("aaaaa", "login ccccc"); drawerLayoutContainer.setAllowOpenDrawer(!(fragment instanceof LoginActivity || fragment instanceof CountrySelectActivity), false); return true; } @@ -2854,6 +2869,7 @@ finish(); return false; } + Log.e("aaaaa", "login dddd"); if (layout.fragmentsStack.size() >= 2 && !(layout.fragmentsStack.get(0) instanceof LoginActivity)) { drawerLayoutContainer.setAllowOpenDrawer(true, false); }