From 34c0bbe434b8eedc8f7710bbe53864d147d7b4bf Mon Sep 17 00:00:00 2001 From: kehaoyuan Date: Mon, 16 Jul 2018 11:22:41 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=B2=89=E6=B5=B8=E6=A0=8F(?= =?UTF-8?q?=E8=83=8C=E6=99=AF:=E7=99=BD=E8=89=B2,=E5=AD=97=E4=BD=93:?= =?UTF-8?q?=E7=81=B0=E8=89=B2)=E9=A2=9C=E8=89=B2,=E7=9B=AE=E5=89=8D?= =?UTF-8?q?=E5=8F=AA=E9=80=82=E9=85=8D=E4=BA=86MIUI=E5=92=8CGoogle?= =?UTF-8?q?=E5=8E=9F=E7=94=9F=E7=B3=BB=E7=BB=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../main/java/com/gh/base/BaseActivity.java | 20 +++++++++++++++++++ .../retrofit/OkHttpCacheInterceptor.java | 14 ------------- .../retrofit/OkHttpNetworkInterceptor.java | 13 ------------ .../gamecenter/retrofit/RetrofitManager.java | 2 +- app/src/main/res/values/colors.xml | 2 +- app/src/main/res/values/styles.xml | 1 + 6 files changed, 23 insertions(+), 29 deletions(-) diff --git a/app/src/main/java/com/gh/base/BaseActivity.java b/app/src/main/java/com/gh/base/BaseActivity.java index e0f896dbf3..e825d85610 100644 --- a/app/src/main/java/com/gh/base/BaseActivity.java +++ b/app/src/main/java/com/gh/base/BaseActivity.java @@ -1,11 +1,13 @@ package com.gh.base; +import android.app.Activity; import android.arch.lifecycle.Lifecycle; import android.content.Intent; import android.os.Bundle; import android.os.Handler; import android.os.Message; import android.support.annotation.NonNull; +import android.view.Window; import com.gh.common.util.DataUtils; import com.gh.common.util.DialogUtils; @@ -28,6 +30,8 @@ import org.json.JSONException; import org.json.JSONObject; import java.lang.ref.WeakReference; +import java.lang.reflect.Field; +import java.lang.reflect.Method; import java.util.List; import butterknife.ButterKnife; @@ -73,9 +77,25 @@ public abstract class BaseActivity extends BaseToolBarActivity implements EasyPe } } + // 小米沉浸式黑色字体 + public void setStatusBarDarkMode(boolean darkmode, Activity activity) { + Class clazz = activity.getWindow().getClass(); + try { + int darkModeFlag = 0; + Class layoutParams = Class.forName("android.view.MiuiWindowManager$LayoutParams"); + Field field = layoutParams.getField("EXTRA_FLAG_STATUS_BAR_DARK_MODE"); + darkModeFlag = field.getInt(layoutParams); + Method extraFlagField = clazz.getMethod("setExtraFlags", int.class, int.class); + extraFlagField.invoke(activity.getWindow(), darkmode ? darkModeFlag : 0, darkModeFlag); + } catch (Exception e) { + e.printStackTrace(); + } + } + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); + setStatusBarDarkMode(true, this); EventBus.getDefault().register(this); ButterKnife.bind(this); mEntrance = getIntent().getStringExtra(KEY_ENTRANCE); diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java index be655f02d3..d6a66bb398 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpCacheInterceptor.java @@ -30,11 +30,6 @@ class OkHttpCacheInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { - -// if (CommonDebug.IS_DEBUG) { -// CommonDebug.logMethodWithParams(this, chain.request().url()); -// } - Request request = chain.request(); // 添加timestamp @@ -57,10 +52,6 @@ class OkHttpCacheInterceptor implements Interceptor { .build(); } - // log 打印 -// Utils.log(String.format("Interceptor Sending request %s on %s%n%s", -// request.url(), chain.connection(), request.headers())); - Response response = chain.proceed(request); // 去除timestamp拿缓存 @@ -76,11 +67,6 @@ class OkHttpCacheInterceptor implements Interceptor { .build(); } } - - // log 打印 -// Utils.log(String.format("Interceptor Received response for %s in %n%s", -// response.request().url(), response.headers())); - return response; } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java index 28c4723633..dacf3429f1 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/OkHttpNetworkInterceptor.java @@ -53,11 +53,6 @@ class OkHttpNetworkInterceptor implements Interceptor { @Override public Response intercept(Chain chain) throws IOException { - -// if (CommonDebug.IS_DEBUG) { -// CommonDebug.logMethodWithParams(this, chain.request().url()); -// } - Request request = chain.request(); // 添加gzip，默认是添加的 @@ -66,10 +61,6 @@ class OkHttpNetworkInterceptor implements Interceptor { // .removeHeader("Accept-Encoding") // .build(); - // log 打印 -// Utils.log(String.format("Interceptor Network Sending request %s on %s%n%s", -// request.url(), chain.connection(), request.headers())); - Response response = chain.proceed(request); // 404 Not Found @@ -102,10 +93,6 @@ class OkHttpNetworkInterceptor implements Interceptor { OkHttpCache.putCache(mContext, TimestampUtils.removeTimestamp(url), response.peekBody(Integer.MAX_VALUE - 1).bytes()); } - // log 打印 -// Utils.log(String.format("Interceptor Network Received response for %s in %n%s", -// response.request().url(), response.headers())); - return response; } diff --git a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java index 2ee5c8816a..0d858337ac 100644 --- a/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java +++ b/app/src/main/java/com/gh/gamecenter/retrofit/RetrofitManager.java @@ -53,7 +53,7 @@ public class RetrofitManager { .addInterceptor(new OkHttpRetryInterceptor(context)) .addNetworkInterceptor(new OkHttpNetworkInterceptor(context)) .connectTimeout(timeout, TimeUnit.SECONDS) - .readTimeout(timeout, TimeUnit.SECONDS) // + .readTimeout(timeout, TimeUnit.SECONDS) .pingInterval(30, TimeUnit.SECONDS) // 加入间隔为30秒的心跳包，用于解决闲置 Http/2 连接关闭时间与服务器不一造成 Connection Timeout 的问题 (https://github.com/square/okhttp/issues/3261) .cache(cache) .build(); diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml index 739bef65a9..3afd89abc6 100644 --- a/app/src/main/res/values/colors.xml +++ b/app/src/main/res/values/colors.xml @@ -4,7 +4,7 @@ #1A7BD5 - #000000 + @color/background @color/text_5d5d5d diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml index 956282f93b..51b64e592d 100644 --- a/app/src/main/res/values/styles.xml +++ b/app/src/main/res/values/styles.xml @@ -7,6 +7,7 @@ @color/system_bar + true @color/theme @color/theme