feat:验证好了,恢复正常配置
This commit is contained in:
@@ -146,7 +146,7 @@ android {
|
|||||||
}
|
}
|
||||||
|
|
||||||
buildTypes {
|
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/"'
|
def server_url_release = '"https://api.pikolive.fun/"'
|
||||||
|
|
||||||
debug {
|
debug {
|
||||||
@@ -184,10 +184,10 @@ android {
|
|||||||
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
|
buildConfigField "String", "BASE_URL_DEBUG", "BASE_URL"
|
||||||
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
|
buildConfigField "String", "BASE_URL_STAGING", "BASE_URL"
|
||||||
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
|
buildConfigField "String", "BASE_URL_RELEASE", "BASE_URL"
|
||||||
minifyEnabled false // 是否混淆
|
minifyEnabled true // 是否混淆
|
||||||
shrinkResources false // 开了混淆的时候才能开启 是否去除无效的资源文件
|
shrinkResources true // 开了混淆的时候才能开启 是否去除无效的资源文件
|
||||||
zipAlignEnabled false // 开了混淆的时候才能开启 是否进行压缩并重排列
|
zipAlignEnabled true // 开了混淆的时候才能开启 是否进行压缩并重排列
|
||||||
crunchPngs false // 启用 PNG 压缩
|
crunchPngs true // 启用 PNG 压缩
|
||||||
signingConfig signingConfigs.v2
|
signingConfig signingConfigs.v2
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
|
@@ -14,7 +14,7 @@ android {
|
|||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@@ -53,22 +53,19 @@ public final class RxNetManager {
|
|||||||
|
|
||||||
mBuilder = new OkHttpClient.Builder();
|
mBuilder = new OkHttpClient.Builder();
|
||||||
|
|
||||||
// if (RxNetLog.DEBUG) {
|
if (RxNetLog.DEBUG) {
|
||||||
//正式环境千万不要加这玩意,为了方便日志查看,拦截器里面加了synchronized关键字,接口请求是串行的
|
//正式环境千万不要加这玩意,为了方便日志查看,拦截器里面加了synchronized关键字,接口请求是串行的
|
||||||
// HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
|
HttpLoggingInterceptor loggingInterceptor = new HttpLoggingInterceptor(new HttpLoggingInterceptor.Logger() {
|
||||||
// @Override
|
@Override
|
||||||
// public void log(String message) {
|
public void log(String message) {
|
||||||
// RxNetLog.d("OKHttp-------%s", message);
|
RxNetLog.d("OKHttp-------%s", message);
|
||||||
// }
|
}
|
||||||
// });
|
});
|
||||||
// loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
|
loggingInterceptor.setLevel(HttpLoggingInterceptor.Level.BODY);
|
||||||
// mBuilder.addInterceptor(loggingInterceptor);
|
mBuilder.addInterceptor(loggingInterceptor);
|
||||||
okhttp3.logging.HttpLoggingInterceptor logginginterceptor = new okhttp3.logging.HttpLoggingInterceptor();
|
|
||||||
logginginterceptor.setLevel(okhttp3.logging.HttpLoggingInterceptor.Level.BODY);
|
|
||||||
mBuilder.addInterceptor(logginginterceptor);
|
|
||||||
|
|
||||||
mBuilder.addNetworkInterceptor(new StethoInterceptor());
|
mBuilder.addNetworkInterceptor(new StethoInterceptor());
|
||||||
// }
|
}
|
||||||
|
|
||||||
for (Interceptor interceptor : interceptors) {
|
for (Interceptor interceptor : interceptors) {
|
||||||
mBuilder.addInterceptor(interceptor);
|
mBuilder.addInterceptor(interceptor);
|
||||||
@@ -80,19 +77,19 @@ public final class RxNetManager {
|
|||||||
// .connectionPool(new ConnectionPool(10, 5, TimeUnit.MINUTES));
|
// .connectionPool(new ConnectionPool(10, 5, TimeUnit.MINUTES));
|
||||||
// 无代理设置,防止被抓包
|
// 无代理设置,防止被抓包
|
||||||
// 指定只要不是 release 包都可以抓包,方便测试进行验证问题
|
// 指定只要不是 release 包都可以抓包,方便测试进行验证问题
|
||||||
// if (Objects.equals(BuildConfig.BUILD_TYPE, "release")) {
|
if (Objects.equals(BuildConfig.BUILD_TYPE, "release")) {
|
||||||
// mBuilder.proxySelector(new ProxySelector() {
|
mBuilder.proxySelector(new ProxySelector() {
|
||||||
// @Override
|
@Override
|
||||||
// public List<Proxy> select(URI uri) {
|
public List<Proxy> select(URI uri) {
|
||||||
// return Collections.singletonList(Proxy.NO_PROXY);
|
return Collections.singletonList(Proxy.NO_PROXY);
|
||||||
// }
|
}
|
||||||
//
|
|
||||||
// @Override
|
@Override
|
||||||
// public void connectFailed(URI uri, SocketAddress socketAddress, IOException e) {
|
public void connectFailed(URI uri, SocketAddress socketAddress, IOException e) {
|
||||||
//
|
|
||||||
// }
|
}
|
||||||
// });
|
});
|
||||||
// }
|
}
|
||||||
|
|
||||||
mOkHttpClient = mBuilder.build();
|
mOkHttpClient = mBuilder.build();
|
||||||
Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").serializeNulls().create();
|
Gson gson = new GsonBuilder().setDateFormat("yyyy-MM-dd HH:mm:ss").serializeNulls().create();
|
||||||
@@ -125,7 +122,7 @@ public final class RxNetManager {
|
|||||||
private RxNetManager mRxNetManager;
|
private RxNetManager mRxNetManager;
|
||||||
|
|
||||||
public Builder debug(boolean isDebug) {
|
public Builder debug(boolean isDebug) {
|
||||||
RxNetLog.DEBUG = true;
|
RxNetLog.DEBUG = isDebug;
|
||||||
return this;
|
return this;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@@ -27,7 +27,7 @@ android {
|
|||||||
|
|
||||||
buildTypes {
|
buildTypes {
|
||||||
release {
|
release {
|
||||||
minifyEnabled false
|
minifyEnabled true
|
||||||
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
proguardFiles getDefaultProguardFile('proguard-android.txt'), 'proguard-rules.pro'
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user