From b1893718f6c2f4b97d17cc0a5898f6ea15c61866 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=BC=A0=E7=8E=89=E4=B9=85?= <1484288157@qq.com> Date: Thu, 21 May 2020 10:31:52 +0800 Subject: [PATCH] =?UTF-8?q?=E5=85=89=E7=8E=AF=E5=8A=A9=E6=89=8BV4.0.1-?= =?UTF-8?q?=E9=A1=B6=E9=83=A8=E7=8A=B6=E6=80=81=E6=A0=8F=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E6=94=B9=E4=B8=BA=E5=85=A8=E9=80=8F=E6=98=8E=E6=A0=B7=E5=BC=8F?= =?UTF-8?q?=20https://gitlab.ghzs.com/pm/halo-app-issues/-/issues/871?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 1 + app/proguard-rules.txt | 5 ++++- app/src/main/java/com/gh/base/ToolBarActivity.java | 9 +++++++-- app/src/main/java/com/gh/common/util/TimeUtils.kt | 1 + .../main/java/com/gh/gamecenter/GameDetailActivity.java | 8 ++++++-- app/src/main/java/com/gh/gamecenter/SearchActivity.kt | 7 ++++++- dependencies.gradle | 1 + 7 files changed, 26 insertions(+), 6 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 372c99e440..e802563323 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -301,6 +301,7 @@ dependencies { debugImplementation "com.github.markzhai:blockcanary-android:$blockcanary" releaseImplementation "com.github.markzhai:blockcanary-no-op:$blockcanary" + implementation "com.gyf.immersionbar:immersionbar:$immersionbar" implementation project(':libraries:LGLibrary') implementation project(':libraries:MTA') diff --git a/app/proguard-rules.txt b/app/proguard-rules.txt index f3beda920a..737911d28e 100644 --- a/app/proguard-rules.txt +++ b/app/proguard-rules.txt @@ -245,4 +245,7 @@ #穿山甲 -keep class com.bytedance.sdk.openadsdk.** { *; } -keep public interface com.bytedance.sdk.openadsdk.downloadnew.** {*;} --keep class com.pgl.sys.ces.* {*;} \ No newline at end of file +-keep class com.pgl.sys.ces.* {*;} + +-keep class com.gyf.immersionbar.* {*;} +-dontwarn com.gyf.immersionbar.** \ No newline at end of file diff --git a/app/src/main/java/com/gh/base/ToolBarActivity.java b/app/src/main/java/com/gh/base/ToolBarActivity.java index 77c0ad8ac5..ae44237f73 100644 --- a/app/src/main/java/com/gh/base/ToolBarActivity.java +++ b/app/src/main/java/com/gh/base/ToolBarActivity.java @@ -23,6 +23,7 @@ import com.gh.gamecenter.entity.GameUpdateEntity; import com.gh.gamecenter.eventbus.EBDownloadStatus; import com.gh.gamecenter.normal.ToolbarController; import com.gh.gamecenter.packagehelper.PackageViewModel; +import com.gyf.immersionbar.ImmersionBar; import com.lightgame.OnTitleClickListener; import org.greenrobot.eventbus.Subscribe; @@ -62,8 +63,12 @@ public abstract class ToolBarActivity extends BaseActivity implements ToolbarCon @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); - - setStatusBarDarkMode(true, this); + ImmersionBar.with(this) + .statusBarColor(R.color.white) + .fitsSystemWindows(true) + .statusBarDarkFont(true) + .init(); +// setStatusBarDarkMode(true, this); initToolbar(); if (showDownloadMenu()) { diff --git a/app/src/main/java/com/gh/common/util/TimeUtils.kt b/app/src/main/java/com/gh/common/util/TimeUtils.kt index aed782ba0d..157aa21eeb 100644 --- a/app/src/main/java/com/gh/common/util/TimeUtils.kt +++ b/app/src/main/java/com/gh/common/util/TimeUtils.kt @@ -1,5 +1,6 @@ package com.gh.common.util +import java.text.ParseException import java.text.SimpleDateFormat import java.util.* diff --git a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java index f958f3efe0..a21616ccbb 100644 --- a/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java +++ b/app/src/main/java/com/gh/gamecenter/GameDetailActivity.java @@ -10,11 +10,11 @@ import com.gh.common.exposure.ExposureManager; import com.gh.common.exposure.ExposureTraceUtils; import com.gh.common.exposure.ExposureType; import com.gh.common.util.DataUtils; -import com.gh.common.util.DisplayUtils; import com.gh.common.util.EntranceUtils; import com.gh.download.DownloadManager; import com.gh.gamecenter.entity.GameEntity; import com.gh.gamecenter.gamedetail.GameDetailFragment; +import com.gyf.immersionbar.ImmersionBar; import com.halo.assistant.HaloApp; import static com.gh.common.constant.Constants.GAME_DETAIL_COME_IN; @@ -31,7 +31,11 @@ public class GameDetailActivity extends NormalActivity { super.onCreate(savedInstanceState); DownloadManager.getInstance(this).updateSpeedLimitationReleaseDelay(10); - DisplayUtils.transparentStatusBar(this); + ImmersionBar.with(this) + .statusBarColor(R.color.tranparent) + .fitsSystemWindows(false) + .init(); +// DisplayUtils.transparentStatusBar(this); } @Override diff --git a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt index 32632900c2..322027c848 100644 --- a/app/src/main/java/com/gh/gamecenter/SearchActivity.kt +++ b/app/src/main/java/com/gh/gamecenter/SearchActivity.kt @@ -17,6 +17,7 @@ import com.gh.gamecenter.eventbus.EBSearch import com.gh.gamecenter.search.SearchDefaultFragment import com.gh.gamecenter.search.SearchGameIndexFragment import com.gh.gamecenter.search.SearchGameResultFragment +import com.gyf.immersionbar.ImmersionBar import com.lightgame.utils.Util_System_Keyboard import com.qq.gdt.action.ActionType import io.reactivex.android.schedulers.AndroidSchedulers @@ -52,7 +53,11 @@ open class SearchActivity : BaseActivity() { @SuppressLint("CheckResult") override fun onCreate(savedInstanceState: Bundle?) { super.onCreate(savedInstanceState) - + ImmersionBar.with(this) + .statusBarColor(R.color.white) + .fitsSystemWindows(true) + .statusBarDarkFont(true) + .init() val hint = intent.getStringExtra(EntranceUtils.KEY_HINT) val searchImmediately = intent.getBooleanExtra(KEY_SEARCH_IMMEDIATELY, false) diff --git a/dependencies.gradle b/dependencies.gradle index fbfb173b83..7f369f4e59 100644 --- a/dependencies.gradle +++ b/dependencies.gradle @@ -103,4 +103,5 @@ ext { romChecker = "1.0.0" oss = "2.9.2" toolargetool = "0.2.1@aar" + immersionbar="3.0.0" } \ No newline at end of file