From 7ac975f4ccdd897ac6c1d91674b78dece8b0875a Mon Sep 17 00:00:00 2001
From: Godfather <981964879@qq.com>
Date: Wed, 27 Apr 2022 09:21:50 +0800
Subject: [PATCH] =?UTF-8?q?version:2.2=20MTK=20fix:=E4=BF=AE=E5=A4=8D?=
 =?UTF-8?q?=E8=81=94=E7=BD=91=E5=8D=87=E7=BA=A7=E6=BB=91=E5=8A=A8=20update?=
 =?UTF-8?q?:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                              |  4 +--
 .../interceptor/RepeatRequestInterceptor.java | 12 ++++----
 .../java/com/aoleyun/sn/utils/JGYUtils.java   | 29 ++++++++++++-------
 3 files changed, 26 insertions(+), 19 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 404c99f..a7e98a2 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -94,8 +94,8 @@ android {
         //MTK
         MTKnewly {
             flavorDimensions "default"
-            versionCode 12
-            versionName "2.1"
+            versionCode 13
+            versionName "2.2"
             buildConfigField "String", "platform", '"MTK"'
             manifestPlaceholders = [
                     AMAP_KEY: "1af68e0a7edcaac82678b1cbb7643408"
diff --git a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java
index 38ab51b..dd06519 100644
--- a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java
+++ b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java
@@ -31,7 +31,7 @@ public class RepeatRequestInterceptor implements Interceptor {
         long time = System.currentTimeMillis();//请求时间
         try {
             if (requestIdsMap.size() > 0 && requestIdsMap.containsKey(requestKey)) {
-                log(requestKey, request);
+                log("重复请求:", requestKey, request);
                 //下面这行写了不会抛出onerror
 //                            chain.call().cancel();
                 return new Response.Builder()
@@ -40,7 +40,7 @@ public class RepeatRequestInterceptor implements Interceptor {
                         .build();
             }
             requestIdsMap.put(requestKey, time);
-            log(requestKey, request);
+            log("注册请求:", requestKey, request);
 //                            RepeatRequestInterceptor.Builder builder = request.newBuilder();
 //                        builder.addHeader("header", jsonObject.toString());
             return chain.proceed(request);
@@ -50,16 +50,16 @@ public class RepeatRequestInterceptor implements Interceptor {
         } finally {
             if (requestIdsMap.containsKey(requestKey) && requestIdsMap.containsValue(time)) {//请求任务完成删除map中的数据
                 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) {
-            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 {
-            Log.e("REPEAT-REQUEST", "移除请求:" + requestKey + " Method @" + request.method());
+            Log.e("REPEAT-REQUEST", action + requestKey + " Method @" + request.method());
         }
     }
 
diff --git a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
index 8168307..d13ca75 100644
--- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
@@ -379,17 +379,24 @@ public class JGYUtils {
             int is_network = netAndLaunchData.getIs_network();
             int is_upgrade = netAndLaunchData.getIs_upgrade();
             int is_slide = netAndLaunchData.getIs_slide();
-
-            if (is_auto == 1) autoLaunchApp.add(app_package);
-
-            if (is_network == 1) allowNetApp.add(app_package);
-            else disallowNetApp.add(app_package);
-
-            if (is_upgrade == 1) allowUpgrade.add(app_package);
-            else disallowUpgrade.add(app_package);
-
-            if (is_slide == 1) allowSlide.add(app_package);
-            else disallowSlide.add(app_package);
+            if (is_auto == 0) {
+                autoLaunchApp.add(app_package);
+            }
+            if (is_network == 0) {
+                allowNetApp.add(app_package);
+            } else {
+                disallowNetApp.add(app_package);
+            }
+            if (is_upgrade == 0) {
+                allowUpgrade.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) {