From 6c05c45fc8f39fe75757a09232c017cf80439070 Mon Sep 17 00:00:00 2001
From: fanhuitong <981964879@qq.com>
Date: Mon, 25 Jul 2022 15:46:44 +0800
Subject: [PATCH] =?UTF-8?q?version:3.4=20fix:=20update:=E5=88=9D=E5=A7=8B?=
 =?UTF-8?q?=E7=99=BD=E5=90=8D=E5=8D=95=E5=A2=9E=E5=8A=A0=E6=89=B6=E5=B0=8F?=
 =?UTF-8?q?=E9=B9=B0app=E5=8C=85=E5=90=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                  | 4 ++--
 app/src/main/java/com/uiui/sn/utils/ApkUtils.java | 4 +++-
 app/src/main/java/com/uiui/sn/utils/JGYUtils.java | 8 ++++++--
 3 files changed, 11 insertions(+), 5 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index dec12bc..5bc5366 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -67,8 +67,8 @@ android {
     productFlavors {
         beta {
             flavorDimensions "default"
-            versionCode 24
-            versionName "3.3"
+            versionCode 25
+            versionName "3.4"
         }
 
         official {
diff --git a/app/src/main/java/com/uiui/sn/utils/ApkUtils.java b/app/src/main/java/com/uiui/sn/utils/ApkUtils.java
index 385a3d0..b92fdc3 100644
--- a/app/src/main/java/com/uiui/sn/utils/ApkUtils.java
+++ b/app/src/main/java/com/uiui/sn/utils/ApkUtils.java
@@ -857,7 +857,9 @@ public class ApkUtils {
     public static void writeAppPackageList(Context context, String result) {
         Log.e(TAG, "writeAppPackageList: " + result);
         addShortcut(context);//开机之后添加图标到桌面
-        HashSet<String> factoryAppList = JGYUtils.getInstance().getOwnApp();
+        HashSet<String> factoryAppList = new HashSet<>();
+        factoryAppList.addAll(JGYUtils.getInstance().getOwnApp());
+        factoryAppList.addAll(JGYUtils.getInstance().getFXYApp());
         if (!TextUtils.isEmpty(result)) {
             HashSet<String> writeAppSet = new HashSet<>(Arrays.asList(result.split(",")));
             writeAppSet.addAll(factoryAppList);
diff --git a/app/src/main/java/com/uiui/sn/utils/JGYUtils.java b/app/src/main/java/com/uiui/sn/utils/JGYUtils.java
index d96dd5c..be442d3 100644
--- a/app/src/main/java/com/uiui/sn/utils/JGYUtils.java
+++ b/app/src/main/java/com/uiui/sn/utils/JGYUtils.java
@@ -80,7 +80,7 @@ public class JGYUtils {
     public static String MTKTag = "MTK";
     public static String ZhanruiTag = "展锐";
 
-    HashSet<String> ownApp = new HashSet<String>() {{
+    private HashSet<String> ownApp = new HashSet<String>() {{
         this.add("com.tt.ttutils");
         this.add(BuildConfig.APPLICATION_ID);
         this.add("com.uiui.sn");
@@ -108,7 +108,7 @@ public class JGYUtils {
         this.add("com.uiui.city");
     }};
 
-    HashSet<String> fuxiaoyingApp = new HashSet<String>() {{
+    private HashSet<String> fuxiaoyingApp = new HashSet<String>() {{
         this.add(gkwxhd);
         this.add(fuxiaoying);
         this.add(moshujia);
@@ -133,6 +133,10 @@ public class JGYUtils {
         return ownApp;
     }
 
+    public HashSet<String> getFXYApp() {
+        return fuxiaoyingApp;
+    }
+
     private JGYUtils(Context context) {
         if (context == null) {
             throw new RuntimeException("Context is NULL");