moliparty/peko-android
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat:验证好了，恢复正常配置

Browse Source
This commit is contained in:
Max
2023-11-11 13:55:11 +08:00
parent c961a1db9a
commit ad07eb825f
4 changed files with 31 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
app/build.gradle
View File

@@ -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'
}

2
core/build.gradle
View File

@@ -14,7 +14,7 @@ android {
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}

51
library/src/main/java/com/bingchuang/library/net/rxnet/manager/RxNetManager.java
View File

@@ -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<Proxy> 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<Proxy> 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;
}

2
nim_uikit/build.gradle
View File

@@ -27,7 +27,7 @@ android {
buildTypes {
release {
minifyEnabled false
minifyEnabled true
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
}
}