diff --git a/app/build.gradle b/app/build.gradle index 863649de5..5aca56a97 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -146,7 +146,7 @@ android { } buildTypes { - def server_url_debug = '"http://api.pikolive.fun/"' + def server_url_debug = '"http://beta.api.pikolive.fun/"' def server_url_release = '"https://api.pikolive.fun/"' debug { @@ -184,10 +184,10 @@ android { buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL" buildConfigField "String", "BASE_URL_STAGING", "BASE_URL" buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL" - minifyEnabled false // 是否混淆 - shrinkResources false // 开了混淆的时候才能开启 是否去除无效的资源文件 - zipAlignEnabled false // 开了混淆的时候才能开启 是否进行压缩并重排列 - crunchPngs false // 启用 PNG 压缩 + minifyEnabled true // 是否混淆 + shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件 + zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列 + crunchPngs true // 启用 PNG 压缩 signingConfig signingConfigs.v2 proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } diff --git a/core/build.gradle b/core/build.gradle index e438d5596..43633b4a6 100644 --- a/core/build.gradle +++ b/core/build.gradle @@ -14,7 +14,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } } diff --git a/library/src/main/java/com/bingchuang/library/net/rxnet/manager/RxNetManager.java b/library/src/main/java/com/bingchuang/library/net/rxnet/manager/RxNetManager.java index 54af5ad12..26c9f6320 100644 --- a/library/src/main/java/com/bingchuang/library/net/rxnet/manager/RxNetManager.java +++ b/library/src/main/java/com/bingchuang/library/net/rxnet/manager/RxNetManager.java @@ -53,22 +53,19 @@ public final class RxNetManager { mBuilder = new OkHttpClient.Builder(); -// if (RxNetLog.DEBUG) { + if (RxNetLog.DEBUG) { //正式环境千万不要加这玩意,为了方便日志查看,拦截器里面加了synchronized关键字,接口请求是串行的 -// HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { -// @Override -// public void log(String message) { -// RxNetLog.d("OKHttp-------%s", message); -// } -// }); -// loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); -// mBuilder.addInterceptor(loggingInterceptor); - okhttp3.logging.HttpLoggingInterceptor logginginterceptor = new okhttp3.logging.HttpLoggingInterceptor(); - logginginterceptor.setLevel(okhttp3.logging.HttpLoggingInterceptor.Level.BODY); - mBuilder.addInterceptor(logginginterceptor); + HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() { + @Override + public void log(String message) { + RxNetLog.d("OKHttp-------%s", message); + } + }); + loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY); + mBuilder.addInterceptor(loggingInterceptor); mBuilder.addNetworkInterceptor(new StethoInterceptor()); -// } + } for (Interceptor interceptor : interceptors) { mBuilder.addInterceptor(interceptor); @@ -80,19 +77,19 @@ public final class RxNetManager { // .connectionPool(new ConnectionPool(10, 5, TimeUnit.MINUTES)); // 无代理设置,防止被抓包 // 指定只要不是 release 包都可以抓包,方便测试进行验证问题 -// if (Objects.equals(BuildConfig.BUILD_TYPE, "release")) { -// mBuilder.proxySelector(new ProxySelector() { -// @Override -// public List select(URI uri) { -// return Collections.singletonList(Proxy.NO_PROXY); -// } -// -// @Override -// public void connectFailed(URI uri, SocketAddress socketAddress, IOException e) { -// -// } -// }); -// } + if (Objects.equals(BuildConfig.BUILD_TYPE, "release")) { + mBuilder.proxySelector(new ProxySelector() { + @Override + public List select(URI uri) { + return Collections.singletonList(Proxy.NO_PROXY); + } + + @Override + public void connectFailed(URI uri, SocketAddress socketAddress, IOException e) { + + } + }); + } mOkHttpClient = mBuilder.build(); Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").serializeNulls().create(); @@ -125,7 +122,7 @@ public final class RxNetManager { private RxNetManager mRxNetManager; public Builder debug(boolean isDebug) { - RxNetLog.DEBUG = true; + RxNetLog.DEBUG = isDebug; return this; } diff --git a/nim_uikit/build.gradle b/nim_uikit/build.gradle index bd8d1b4ef..0c17ad91e 100644 --- a/nim_uikit/build.gradle +++ b/nim_uikit/build.gradle @@ -27,7 +27,7 @@ android { buildTypes { release { - minifyEnabled false + minifyEnabled true proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro' } }