diff --git a/app/libs/leto-antiaddiction-3.9.2.aar b/app/libs/leto-antiaddiction-3.9.2.aar new file mode 100644 index 0000000000..dcb0e452de Binary files /dev/null and b/app/libs/leto-antiaddiction-3.9.2.aar differ diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml index 7894adde32..5d09c87b01 100644 --- a/app/src/main/AndroidManifest.xml +++ b/app/src/main/AndroidManifest.xml @@ -58,6 +58,7 @@ com.ledong.lib.leto, com.leto.game.base.glide4, com.leto.game.ad.gdt, + com.leto.game.fcm, com.leto.game.ad.toutiao" /> diff --git a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt index 3b60b18d53..d2fffbaea2 100644 --- a/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt +++ b/app/src/main/java/com/gh/gamecenter/game/GameFragmentAdapter.kt @@ -370,6 +370,7 @@ class GameFragmentAdapter(context: Context, entity.type == EntranceUtils.HOST_COMMUNITY -> DirectUtils.directToCommunity(mContext, CommunityEntity(entity.link!!, entity.text!!)) entity.type == "top_game_comment" -> DirectUtils.directToAmway(mContext, null, "(推荐入口)", "") entity.type == "server" -> mContext.startActivity(GameServersActivity.getIntent(mContext, "(推荐入口)", "")) + entity.type == "h5_game_center" -> DirectUtils.directLetoGameCenter(mContext) else -> DialogUtils.showLowVersionDialog(mContext) } } diff --git a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java index 15c5d0d1cc..549e274bfa 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java @@ -7,6 +7,7 @@ import android.os.Bundle; import android.text.TextUtils; import android.view.MenuItem; import android.view.View; +import android.view.WindowManager; import android.webkit.JavascriptInterface; import android.webkit.WebChromeClient; import android.webkit.WebSettings; @@ -129,10 +130,12 @@ public class WebFragment extends NormalFragment { @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - if (TextUtils.isEmpty(mGameName)) { - initMenu(); - } else { + if (!TextUtils.isEmpty(mGameName) && mIsBackpressRequireConfirmation) { if (requireActivity() instanceof ToolbarController) { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.KITKAT) { + requireActivity().getWindow().addFlags(WindowManager.LayoutParams.FLAG_TRANSLUCENT_STATUS); + DisplayUtils.setStatusBarColor(requireActivity(), R.color.tranparent, false); + } ((ToolbarController) requireActivity()).hideToolbar(true); closeBtn.setVisibility(View.VISIBLE); RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) closeBtn.getLayoutParams(); @@ -140,6 +143,8 @@ public class WebFragment extends NormalFragment { closeBtn.setLayoutParams(params); closeBtn.setOnClickListener(v -> onBackPressed()); } + } else { + initMenu(); } } diff --git a/app/src/main/res/layout/fragment_web.xml b/app/src/main/res/layout/fragment_web.xml index 55d5867333..8d4a99ec6b 100644 --- a/app/src/main/res/layout/fragment_web.xml +++ b/app/src/main/res/layout/fragment_web.xml @@ -1,7 +1,10 @@ - + - \ No newline at end of file + \ No newline at end of file