From 4f87cac46a4e4f66ab666f395b6044dedffce028 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com>
Date: Mon, 1 Jun 2020 10:27:35 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96h5=E5=B0=8F=E6=B8=B8=E6=88=8F?=
 =?UTF-8?q?=E5=85=A8=E5=B1=8F=E5=B1=95=E7=A4=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/src/main/AndroidManifest.xml              |  4 ---
 .../gh/common/databind/BindingAdapters.java   |  4 +--
 .../com/gh/common/util/DownloadItemUtils.java |  4 +--
 .../java/com/gh/gamecenter/H5GameActivity.kt  | 35 -------------------
 .../java/com/gh/gamecenter/WebActivity.java   | 28 ++++++++++++---
 .../adapter/viewholder/DetailViewHolder.java  |  4 +--
 app/src/main/res/layout/activity_h5_game.xml  |  6 ----
 7 files changed, 30 insertions(+), 55 deletions(-)
 delete mode 100644 app/src/main/java/com/gh/gamecenter/H5GameActivity.kt
 delete mode 100644 app/src/main/res/layout/activity_h5_game.xml

diff --git a/app/src/main/AndroidManifest.xml b/app/src/main/AndroidManifest.xml
index 2a4002117c..df4ae9b113 100644
--- a/app/src/main/AndroidManifest.xml
+++ b/app/src/main/AndroidManifest.xml
@@ -514,10 +514,6 @@
             android:name=".qa.answer.draft.AnswerDraftActivity"
             android:screenOrientation="portrait" />
 
-        <activity android:name="com.gh.gamecenter.H5GameActivity"
-            android:screenOrientation="portrait"
-            android:theme="@style/AppFullScreenTheme"/>
-
         <!-- 使用小米/华为推送弹窗功能提高推送成功率-->
         <activity
             android:name="com.gh.gamecenter.PushProxyActivity"
diff --git a/app/src/main/java/com/gh/common/databind/BindingAdapters.java b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
index 7fc60af2ab..6b5b51d03c 100644
--- a/app/src/main/java/com/gh/common/databind/BindingAdapters.java
+++ b/app/src/main/java/com/gh/common/databind/BindingAdapters.java
@@ -42,8 +42,8 @@ import com.gh.common.view.DrawableView;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
 import com.gh.gamecenter.DownloadManagerActivity;
-import com.gh.gamecenter.H5GameActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.baselist.LoadStatus;
 import com.gh.gamecenter.databinding.KaifuAddItemBinding;
 import com.gh.gamecenter.databinding.KaifuDetailItemRowBinding;
@@ -485,7 +485,7 @@ public class BindingAdapters {
                         HistoryHelper.insertGameEntity(gameEntity);
                     }
 
-                    Intent i = new Intent(H5GameActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), isPlay));
+                    Intent i = new Intent(WebActivity.getIntentForWebGame(progressBar.getContext(), linkEntity.getLink(), gameEntity.getName(), isPlay));
                     progressBar.getContext().startActivity(i);
                     break;
             }
diff --git a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
index eeeb83c19c..0186343afa 100644
--- a/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
+++ b/app/src/main/java/com/gh/common/util/DownloadItemUtils.java
@@ -18,8 +18,8 @@ import com.gh.common.repository.ReservationRepository;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
 import com.gh.gamecenter.DownloadManagerActivity;
-import com.gh.gamecenter.H5GameActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.adapter.viewholder.GameViewHolder;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
@@ -434,7 +434,7 @@ public class DownloadItemUtils {
                     HistoryHelper.insertGameEntity(gameEntity);
                 }
 
-                Intent i = H5GameActivity.getIntentForWebGame(context, gameEntity.getH5Link().getLink(), gameEntity.getName(), isPlay);
+                Intent i = WebActivity.getIntentForWebGame(context, gameEntity.getH5Link().getLink(), gameEntity.getName(), isPlay);
                 context.startActivity(i);
             });
         } else if (gameEntity.getApk().size() == 1) {
diff --git a/app/src/main/java/com/gh/gamecenter/H5GameActivity.kt b/app/src/main/java/com/gh/gamecenter/H5GameActivity.kt
deleted file mode 100644
index d7ce6d51a5..0000000000
--- a/app/src/main/java/com/gh/gamecenter/H5GameActivity.kt
+++ /dev/null
@@ -1,35 +0,0 @@
-package com.gh.gamecenter
-
-import android.content.Context
-import android.content.Intent
-import android.os.Bundle
-import com.gh.base.BaseActivity
-import com.gh.common.util.EntranceUtils
-import com.halo.assistant.fragment.WebFragment
-
-class H5GameActivity : BaseActivity() {
-
-    override fun getLayoutId(): Int = R.layout.activity_h5_game
-
-    override fun onCreate(savedInstanceState: Bundle?) {
-        super.onCreate(savedInstanceState)
-        val containerFragment = WebFragment().with(intent.extras)
-        // 若 placeholder 外层为 RelativeLayout 的话，会出现莫名的偏移
-        supportFragmentManager.beginTransaction().replace(R.id.placeholder, containerFragment).commitAllowingStateLoss()
-    }
-
-    companion object {
-        @JvmStatic
-        fun getIntentForWebGame(context: Context?, url: String?, gameName: String?, interveneBackpress: Boolean): Intent {
-            val intent = Intent(context, H5GameActivity::class.java)
-            intent.putExtra(EntranceUtils.KEY_URL, url)
-            intent.putExtra(WebFragment.KEY_GAME_NAME, gameName)
-            intent.putExtra(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, true)
-            if (interveneBackpress) {
-                intent.putExtra(WebFragment.KEY_REQUIRE_BACK_CONFIRMATION, true)
-                intent.putExtra(WebFragment.KEY_BACK_CONFIRMATION_CONTENT, "退出后将不保存当前游戏进度，确定退出吗？")
-            }
-            return intent
-        }
-    }
-}
\ No newline at end of file
diff --git a/app/src/main/java/com/gh/gamecenter/WebActivity.java b/app/src/main/java/com/gh/gamecenter/WebActivity.java
index cec2d50f08..4917f7b46b 100644
--- a/app/src/main/java/com/gh/gamecenter/WebActivity.java
+++ b/app/src/main/java/com/gh/gamecenter/WebActivity.java
@@ -3,6 +3,7 @@ package com.gh.gamecenter;
 import android.content.Context;
 import android.content.Intent;
 import android.os.Bundle;
+import android.text.TextUtils;
 import android.view.View;
 
 import com.gh.common.constant.Constants;
@@ -18,12 +19,31 @@ import java.util.Locale;
 
 import androidx.annotation.NonNull;
 
+import static com.halo.assistant.fragment.WebFragment.KEY_GAME_NAME;
+import static com.halo.assistant.fragment.WebFragment.KEY_REQUIRE_BACK_CONFIRMATION;
+
 /**
  * Created by khy on 2016/10/18.
  */
 @Deprecated
 public class WebActivity extends NormalActivity {
 
+    private boolean mIsFullScreen;
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        String mGameName = getIntent().getBundleExtra(NORMAL_FRAGMENT_BUNDLE).getString(KEY_GAME_NAME);
+        boolean mIsBackpressRequireConfirmation = getIntent().getBundleExtra(NORMAL_FRAGMENT_BUNDLE).getBoolean(KEY_REQUIRE_BACK_CONFIRMATION, false);
+        mIsFullScreen = !TextUtils.isEmpty(mGameName) && mIsBackpressRequireConfirmation;
+        if (mIsFullScreen) {
+            setTheme(R.style.AppFullScreenTheme);
+        }
+        super.onCreate(savedInstanceState);
+        if (mIsFullScreen) {
+            hideToolbar(true);
+        }
+    }
+
     @Override
     protected Intent provideNormalIntent() {
         return getTargetIntent(this, WebActivity.class, WebFragment.class);
@@ -200,17 +220,17 @@ public class WebActivity extends NormalActivity {
         return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle);
     }
 
-    /*public static Intent getIntentForWebGame(Context context, String url, String gameName, boolean interveneBackpress) {
+    public static Intent getIntentForWebGame(Context context, String url, String gameName, boolean interveneBackpress) {
         Bundle bundle = new Bundle();
         bundle.putString(EntranceUtils.KEY_URL, url);
-        bundle.putString(WebFragment.KEY_GAME_NAME, gameName);
+        bundle.putString(KEY_GAME_NAME, gameName);
         bundle.putBoolean(WebFragment.KEY_LEAVE_WEB_PAGE_TO_HANDLE_TITLE, true);
         if (interveneBackpress) {
-            bundle.putBoolean(WebFragment.KEY_REQUIRE_BACK_CONFIRMATION, true);
+            bundle.putBoolean(KEY_REQUIRE_BACK_CONFIRMATION, true);
             bundle.putString(WebFragment.KEY_BACK_CONFIRMATION_CONTENT, "退出后将不保存当前游戏进度，确定退出吗？");
         }
         return getTargetIntent(context, WebActivity.class, WebFragment.class, bundle);
-    }*/
+    }
 
     @Override
     protected View.OnClickListener provideNavigationItemClickListener() {
diff --git a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
index 9d574a8c6d..62c0e80b8f 100644
--- a/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
+++ b/app/src/main/java/com/gh/gamecenter/adapter/viewholder/DetailViewHolder.java
@@ -27,8 +27,8 @@ import com.gh.common.view.DownloadProgressBar;
 import com.gh.download.DownloadManager;
 import com.gh.download.dialog.DownloadDialog;
 import com.gh.gamecenter.DownloadManagerActivity;
-import com.gh.gamecenter.H5GameActivity;
 import com.gh.gamecenter.R;
+import com.gh.gamecenter.WebActivity;
 import com.gh.gamecenter.entity.ApkEntity;
 import com.gh.gamecenter.entity.GameEntity;
 import com.gh.gamecenter.entity.LinkEntity;
@@ -253,7 +253,7 @@ public class DetailViewHolder {
                         HistoryHelper.insertGameEntity(mGameEntity);
                     }
 
-                    Intent i = new Intent(H5GameActivity.getIntentForWebGame(mViewHolder.context, linkEntity.getLink(), mGameEntity.getName(),isPlay));
+                    Intent i = new Intent(WebActivity.getIntentForWebGame(mViewHolder.context, linkEntity.getLink(), mGameEntity.getName(),isPlay));
                     mViewHolder.context.startActivity(i);
                     break;
             }
diff --git a/app/src/main/res/layout/activity_h5_game.xml b/app/src/main/res/layout/activity_h5_game.xml
deleted file mode 100644
index 09b403754d..0000000000
--- a/app/src/main/res/layout/activity_h5_game.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<com.gh.common.view.MaterializedFrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:id="@+id/placeholder"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:fitsSystemWindows="true" />
\ No newline at end of file