tongtong/CubeAoleyunSN
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

version:2.2 MTK

Browse Source 
fix:修复联网升级滑动
update:
This commit is contained in:
Godfather
2022-04-27 09:21:50 +08:00
parent 2bf051b8c1
commit 7ac975f4cc
3 changed files with 26 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
app/build.gradle
View File

@@ -94,8 +94,8 @@ android {
//MTK //MTK
MTKnewly { MTKnewly {
flavorDimensions "default" flavorDimensions "default"
versionCode 12 versionCode 13
versionName "2.1" versionName "2.2"
buildConfigField "String", "platform", '"MTK"' buildConfigField "String", "platform", '"MTK"'
manifestPlaceholders = [ manifestPlaceholders = [
AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408" AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408"

12
app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java
View File

@@ -31,7 +31,7 @@ public class RepeatRequestInterceptor implements Interceptor {
long time = System.currentTimeMillis();//请求时间 long time = System.currentTimeMillis();//请求时间
try { try {
if (requestIdsMap.size() > 0 && requestIdsMap.containsKey(requestKey)) { if (requestIdsMap.size() > 0 && requestIdsMap.containsKey(requestKey)) {
log(requestKey, request); log("重复请求:", requestKey, request);
//下面这行写了不会抛出onerror //下面这行写了不会抛出onerror
// chain.call().cancel(); // chain.call().cancel();
return new Response.Builder() return new Response.Builder()
@@ -40,7 +40,7 @@ public class RepeatRequestInterceptor implements Interceptor {
.build(); .build();
} }
requestIdsMap.put(requestKey, time); requestIdsMap.put(requestKey, time);
log(requestKey, request); log("注册请求:", requestKey, request);
// RepeatRequestInterceptor.Builder builder = request.newBuilder(); // RepeatRequestInterceptor.Builder builder = request.newBuilder();
// builder.addHeader("header", jsonObject.toString()); // builder.addHeader("header", jsonObject.toString());
return chain.proceed(request); return chain.proceed(request);
@@ -50,16 +50,16 @@ public class RepeatRequestInterceptor implements Interceptor {
} finally { } finally {
if (requestIdsMap.containsKey(requestKey) && requestIdsMap.containsValue(time)) {//请求任务完成删除map中的数据 if (requestIdsMap.containsKey(requestKey) && requestIdsMap.containsValue(time)) {//请求任务完成删除map中的数据
requestIdsMap.remove(requestKey); requestIdsMap.remove(requestKey);
log(requestKey, request); log("移除请求:", requestKey, request);
} }
} }
} }
private void log(String requestKey, Request request) { private void log(String action, String requestKey, Request request) {
if (BuildConfig.DEBUG) { if (BuildConfig.DEBUG) {
Log.e("REPEAT-REQUEST", "移除请求:" + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + bodyToString(request)); Log.e("REPEAT-REQUEST", action + requestKey + " Method @" + request.method() + " --- " + " URL = " + request.url() + "\t" + bodyToString(request));
} else { } else {
Log.e("REPEAT-REQUEST", "移除请求:" + requestKey + " Method @" + request.method()); Log.e("REPEAT-REQUEST", action + requestKey + " Method @" + request.method());
} }
} }

29
app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
View File

@@ -379,17 +379,24 @@ public class JGYUtils {
int is_network = netAndLaunchData.getIs_network(); int is_network = netAndLaunchData.getIs_network();
int is_upgrade = netAndLaunchData.getIs_upgrade(); int is_upgrade = netAndLaunchData.getIs_upgrade();
int is_slide = netAndLaunchData.getIs_slide(); int is_slide = netAndLaunchData.getIs_slide();
if (is_auto == 0) {
if (is_auto == 1) autoLaunchApp.add(app_package); autoLaunchApp.add(app_package);
}
if (is_network == 1) allowNetApp.add(app_package); if (is_network == 0) {
else disallowNetApp.add(app_package); allowNetApp.add(app_package);
} else {
if (is_upgrade == 1) allowUpgrade.add(app_package); disallowNetApp.add(app_package);
else disallowUpgrade.add(app_package); }
if (is_upgrade == 0) {
if (is_slide == 1) allowSlide.add(app_package); allowUpgrade.add(app_package);
else disallowSlide.add(app_package); } else {
disallowUpgrade.add(app_package);
}
if (is_slide == 0) {
allowSlide.add(app_package);
} else {
disallowSlide.add(app_package);
}
} }
if (disallowSlide.size() != 0) { if (disallowSlide.size() != 0) {