From 704b73aef785b58da421ec2a3e9ba28ed000f107 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, 18 May 2020 11:20:32 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E5=AE=8C=E6=88=90=E5=85=89=E7=8E=AF?= =?UTF-8?q?=E5=8A=A9=E6=89=8BV4.0.1-H5=E6=B8=B8=E6=88=8F=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=E4=BC=98=E5=8C=96=EF=BC=88=E6=8E=A5=E5=85=A5=E6=A2=A6=E5=B7=A5?= =?UTF-8?q?=E5=8E=82H5=E5=B0=8F=E6=B8=B8=E6=88=8F=EF=BC=89https://gitlab.g?= =?UTF-8?q?hzs.com/pm/halo-app-issues/-/issues/856?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../java/com/gh/base/ToolBarActivity.java | 12 ++++++-- .../java/com/gh/common/util/DirectUtils.kt | 2 ++ .../com/gh/gamecenter/NormalActivity.java | 4 +-- .../gamecenter/normal/ToolbarController.java | 5 +++- .../halo/assistant/fragment/WebFragment.java | 27 ++++++++++++++---- .../res/drawable-xxhdpi/ico_web_close.png | Bin 0 -> 1070 bytes app/src/main/res/drawable/bg_web_close.xml | 17 +++++++++++ app/src/main/res/layout/fragment_web.xml | 17 +++++++++++ 8 files changed, 74 insertions(+), 10 deletions(-) create mode 100644 app/src/main/res/drawable-xxhdpi/ico_web_close.png create mode 100644 app/src/main/res/drawable/bg_web_close.xml diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index b1fc079ab4..77c0ad8ac5 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -3,7 +3,6 @@ package com.gh.base; import android.annotation.SuppressLint; import android.app.Activity; import android.content.Intent; -import android.os.Build; import android.os.Bundle; import android.text.TextUtils; import android.view.Menu; @@ -12,7 +11,6 @@ import android.view.MenuItem; import android.view.View; import android.view.ViewGroup; import android.view.Window; -import android.view.WindowManager; import android.widget.RelativeLayout; import android.widget.TextView; @@ -52,6 +50,8 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Nullable private PackageViewModel mPackageViewModel; + protected RelativeLayout mToolbarContainer; + protected Toolbar mToolbar; protected TextView mTitleTv; @@ -88,6 +88,7 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon } private void initToolbar() { + mToolbarContainer = findViewById(R.id.normal_toolbar_container); mToolbar = findViewById(R.id.normal_toolbar); mTitleTv = findViewById(R.id.normal_title); if (mToolbar != null) { @@ -253,4 +254,11 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon protected boolean showDownloadMenu() { return false; } + + @Override + public void hideToolbar(boolean isHide) { + if (mToolbarContainer != null) { + mToolbarContainer.setVisibility(isHide ? View.GONE : View.VISIBLE); + } + } } diff --git a/app/src/main/java/com/gh/common/util/DirectUtils.kt b/app/src/main/java/com/gh/common/util/DirectUtils.kt index 0051d39f5d..c02f020ae2 100644 --- a/app/src/main/java/com/gh/common/util/DirectUtils.kt +++ b/app/src/main/java/com/gh/common/util/DirectUtils.kt @@ -219,6 +219,8 @@ object DirectUtils { "anliwall" -> directToAmway(context, fixedTopAmwayCommentId = null, entrance = entrance, path = path) + "h5_game_center" -> directLetoGameCenter(context) + "" -> { // do nothing } diff --git a/app/src/main/java/com/gh/gamecenter/NormalActivity.java b/app/src/main/java/com/gh/gamecenter/NormalActivity.java index 349f88c14b..6f4870da07 100644 --- a/app/src/main/java/com/gh/gamecenter/NormalActivity.java +++ b/app/src/main/java/com/gh/gamecenter/NormalActivity.java @@ -7,11 +7,11 @@ import android.text.TextUtils; import android.view.MenuItem; import android.view.MotionEvent; -import androidx.fragment.app.Fragment; - import com.gh.base.ToolBarActivity; import com.gh.gamecenter.normal.NormalFragment; +import androidx.fragment.app.Fragment; + /** * Created by khy on 17/10/17. */ diff --git a/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java b/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java index 72255827ab..ce5f18b2cf 100644 --- a/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java +++ b/app/src/main/java/com/gh/gamecenter/normal/ToolbarController.java @@ -1,9 +1,10 @@ package com.gh.gamecenter.normal; +import android.view.MenuItem; + import androidx.annotation.IdRes; import androidx.annotation.MenuRes; import androidx.annotation.StringRes; -import android.view.MenuItem; /** * Created by khy on 17/10/17. @@ -19,4 +20,6 @@ public interface ToolbarController { // 注意 先initMenu 在getMenuItem MenuItem getMenuItem(@IdRes int res); + + void hideToolbar(boolean isHide); } 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 0f631943ef..064c8bd199 100644 --- a/app/src/main/java/com/halo/assistant/fragment/WebFragment.java +++ b/app/src/main/java/com/halo/assistant/fragment/WebFragment.java @@ -16,8 +16,6 @@ import android.widget.ProgressBar; import android.widget.RelativeLayout; import android.widget.TextView; -import androidx.annotation.Nullable; - import com.gh.base.BaseActivity; import com.gh.common.AppExecutor; import com.gh.common.DefaultJsApi; @@ -27,6 +25,7 @@ import com.gh.common.constant.Constants; import com.gh.common.util.CheckLoginUtils; import com.gh.common.util.CollectionUtils; import com.gh.common.util.DialogHelper; +import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.common.util.GsonUtils; import com.gh.common.util.MtaHelper; @@ -41,6 +40,7 @@ import com.gh.gamecenter.entity.WebShareEntity; import com.gh.gamecenter.eventbus.EBReuse; import com.gh.gamecenter.message.MessageDetailFragment; import com.gh.gamecenter.normal.NormalFragment; +import com.gh.gamecenter.normal.ToolbarController; import com.gh.gamecenter.personal.PersonalFragment; import com.gh.gamecenter.retrofit.Response; import com.gh.gamecenter.retrofit.RetrofitManager; @@ -52,6 +52,7 @@ import org.greenrobot.eventbus.ThreadMode; import java.util.HashMap; import java.util.List; +import androidx.annotation.Nullable; import butterknife.BindView; import butterknife.OnClick; import io.reactivex.android.schedulers.AndroidSchedulers; @@ -84,6 +85,8 @@ public class WebFragment extends NormalFragment { TextView webComment; @BindView(R.id.news_bottom) RelativeLayout newsBottom; + @BindView(R.id.closeBtn) + RelativeLayout closeBtn; MenuItem mMenuShare; MenuItem mMenuCollect; @@ -123,7 +126,19 @@ public class WebFragment extends NormalFragment { @Override public void onActivityCreated(@Nullable Bundle savedInstanceState) { super.onActivityCreated(savedInstanceState); - initMenu(); + if (TextUtils.isEmpty(mGameName)) { + initMenu(); + } else { + if (requireActivity() instanceof ToolbarController) { + ((ToolbarController) requireActivity()).hideToolbar(true); + DisplayUtils.transparentStatusBar(requireActivity()); + closeBtn.setVisibility(View.VISIBLE); + RelativeLayout.LayoutParams params = (RelativeLayout.LayoutParams) closeBtn.getLayoutParams(); + params.topMargin = params.topMargin + DisplayUtils.getStatusBarHeight(getResources()); + closeBtn.setLayoutParams(params); + closeBtn.setOnClickListener(v -> onBackPressed()); + } + } } private void initMenu() { @@ -415,13 +430,15 @@ public class WebFragment extends NormalFragment { @Override public void onResume() { super.onResume(); - mWebView.callHandler("videoPlay", retValue -> {}); + mWebView.callHandler("videoPlay", retValue -> { + }); } @Override public void onPause() { super.onPause(); - mWebView.callHandler("videoPause", retValue -> {}); + mWebView.callHandler("videoPause", retValue -> { + }); } class ShareNativeCallback { diff --git a/app/src/main/res/drawable-xxhdpi/ico_web_close.png b/app/src/main/res/drawable-xxhdpi/ico_web_close.png new file mode 100644 index 0000000000000000000000000000000000000000..3e22b30bf4422f0a7026d4339b21ae28afca2544 GIT binary patch literal 1070 zcmV+}1kwA6P)Px#L}ge>W=%~1DgXcg2mk?xX#fNO00031000^Q000001E2u_0{{R30RRC20H6W@ z1ONa40RR91FrWhf1ONa40RR91FaQ7m0NXcg3;+NFm`OxIRA>d&nlW$GFc^mKC|=UHJp|OJHSTxm(Iq5EOOe4|M1Rq9Z3!p)yn|&wF+5 z(vZ(~PRSL&(yPSw>(AfkB#!N*-KqgsS67Re*@iv12D`8Wm!WVDNAMJ$z)$e7-ELoS zydB_l2kyZk{0*x@byQb26zqIJV@t3Pf5EySTe7*-SQHpvfcx+aHU-&M8w<4tg25H| z70wH4Yo(STFtiSv>~*VC)aH69h_+9FfnCbqz=`5$Zq8Y+FG&4_Z{!;L_;q1vz@-|Qil z!hNeI`7->d5zli*)rM<}Ln-!i^64p3yChU8mhrW6gZ*&D*SBN$!ANm8Zb90Mr*z7hGP+eMQF|EwLl4i`Wx^k zjD@rtLBj~p=`CLd`MfB>PFX2=Y9u&4K%<_o;ym&(R3~^P&}iCW+26TCkXA1rFp0X1 z=p{||rVms^1t(D*)%C*paA1gf3P5YvGH6!m1wEsOa?>mF7j8NmepRdW!4Rw|fUZ&a z-N?^pzsM(MJdd%V>3JEt3c$Mjn$L&uBqWF^kFjC-(oq1})<>}|t5RO)pB?6v_IZpA z%a>&ZV8Oduvnn-|Z~CGDwCPj^EdxXN5fVg{$JnrZIadH$%a%cF*bu&i1QF#iHY{I8 z3gFaeL<{f`-h~7a7#sJ#q%R)BUEkM5S%1Gl~4d_ zPv&%K2qN9-v8?V$i+UG8+S@8Fh;%o$TmWfrExI7m-P~0G0^@1A z+w0dMjDy&IcfGvRJ0YuCDPF=|b!&A6{JnX}drL+O5I&4MC`bU$=wLFh;zY5r=E55fiV oU;OOh9fgWcTWPM!t^IEE7w)-S9-G2YZU6uP07*qoM6N<$g1JKAp8x;= literal 0 HcmV?d00001 diff --git a/app/src/main/res/drawable/bg_web_close.xml b/app/src/main/res/drawable/bg_web_close.xml new file mode 100644 index 0000000000..1097cf486f --- /dev/null +++ b/app/src/main/res/drawable/bg_web_close.xml @@ -0,0 +1,17 @@ + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/app/src/main/res/layout/fragment_web.xml b/app/src/main/res/layout/fragment_web.xml index fdb7882802..55d5867333 100644 --- a/app/src/main/res/layout/fragment_web.xml +++ b/app/src/main/res/layout/fragment_web.xml @@ -43,4 +43,21 @@ android:textSize = "16sp" /> + + + + + \ No newline at end of file From d36b2f99ee38d22c7ed14e090e01644c03da7390 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, 18 May 2020 11:52:33 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E5=8D=87=E7=BA=A7gsyVideo=E7=89=88?= =?UTF-8?q?=E6=9C=AC=E8=87=B37.1.4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/src/main/java/com/gh/download/cache/ExoCacheManager.kt | 6 +++--- dependencies.gradle | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt b/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt index e71f30f5b6..5f02192aaf 100644 --- a/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt +++ b/app/src/main/java/com/gh/download/cache/ExoCacheManager.kt @@ -16,7 +16,7 @@ import okhttp3.OkHttpClient import okhttp3.Request import okhttp3.Response import tv.danmaku.ijk.media.exo2.ExoSourceManager -import tv.danmaku.ijk.media.exo2.source.GSYExoHttpDataSource +import tv.danmaku.ijk.media.exo2.source.GSYDefaultHttpDataSource import tv.danmaku.ijk.media.exo2.source.GSYExoHttpDataSourceFactory import java.util.concurrent.ConcurrentHashMap import java.util.concurrent.atomic.AtomicBoolean @@ -44,8 +44,8 @@ object ExoCacheManager { val simpleCache = ExoSourceManager.getCacheSingleInstance(HaloApp.getInstance().application, null) val dataSourceFactory = GSYExoHttpDataSourceFactory(Util.getUserAgent(HaloApp.getInstance().application, "ExoCacheManager"), DefaultBandwidthMeter.Builder(HaloApp.getInstance().application).build(), - GSYExoHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS, - GSYExoHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS, false) + GSYDefaultHttpDataSource.DEFAULT_CONNECT_TIMEOUT_MILLIS, + GSYDefaultHttpDataSource.DEFAULT_READ_TIMEOUT_MILLIS, false) val cacheDataSource = CacheDataSource(simpleCache, dataSourceFactory.createDataSource()) try { CacheUtil.cache(dataSpec, simpleCache, CacheUtil.DEFAULT_CACHE_KEY_FACTORY, cacheDataSource, CacheUtil.ProgressListener { requestLength, bytesCached, newBytesCached -> diff --git a/dependencies.gradle b/dependencies.gradle index 05ec91091a..fbfb173b83 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -84,7 +84,7 @@ ext { versioncompare = "1.2.8" - gsyVideo = "7.1.2" + gsyVideo = "7.1.4" chucker = "3.0.1-fixed-SNAPSHOT"