From 9ad90393b7a4848314cd4b1d57bcd2a859e05309 Mon Sep 17 00:00:00 2001
From: fanhuitong <981964879@qq.com>
Date: Sat, 15 May 2021 11:32:17 +0800
Subject: [PATCH] =?UTF-8?q?version:2.0.5=20update:=20fix:=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D=E6=A1=8C=E9=9D=A2=E5=8F=AF=E4=BB=A5=E5=88=A0=E9=99=A4?=
 =?UTF-8?q?=20add:?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                 |  4 ++--
 .../com/mjsheng/myappstore/utils/ApkUtils.java   |  3 +++
 .../com/mjsheng/myappstore/utils/JGYUtils.java   |  5 ++++-
 .../mjsheng/myappstore/utils/SaveListUtils.java  | 16 ++++++++++++----
 4 files changed, 21 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index 218a14c..02a1b52 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -41,9 +41,9 @@ android {
         //新平台正式
         newly {
             flavorDimensions "default"
-            versionCode 504
+            versionCode 505
             //versionCode 1037
-            versionName "2.0.4"
+            versionName "2.0.5"
             /*********************************极光推送************************************/
             manifestPlaceholders = [
                     JPUSH_PKGNAME: "com.jiaoguanyi.appstore",
diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
index 967f733..5e9146c 100644
--- a/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/ApkUtils.java
@@ -652,6 +652,9 @@ public class ApkUtils {
         this.add("com.easyclient.activity");//移动课堂
         this.add("com.jiandan.mobilelesson");//简单课堂
         this.add("com.jiaoguanyi.store");//教官壹
+    }};
+
+    public static List<String> desktopAPP = new ArrayList<String>(){{
         this.add("com.uiuios.jgy1");
         this.add("com.uiuios.jgy2");
     }};
diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java
index c8b1e9c..7270abf 100644
--- a/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/JGYUtils.java
@@ -479,7 +479,7 @@ public class JGYUtils {
             jsonObject.put("app_id", app_id);
             int app_version_code = forceDownloadData.getApp_version_code();
             Log.e("fht ", "packageName=" + app_package + ",URL= " + app_url + ",app_version_code=" + app_version_code);
-            if (data.get(i).getApp_package().equals("com.jiaoguanyi.appstore")) {
+            if (BuildConfig.APPLICATION_ID.equals(data.get(i).getApp_package())) {
                 continue;//为自身的跳过下载
             }
             if (!list.contains(app_package)) {
@@ -652,6 +652,9 @@ public class JGYUtils {
                 if (ApkUtils.systemapp.contains(packageName)) {
                     continue;
                 }
+                if (ApkUtils.desktopAPP.contains(packageName)) {
+                    continue;
+                }
                 if (ApkUtils.canremove_systemapp.contains(packageName)) {
                     continue;
                 }
diff --git a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java
index fed4a54..d687804 100644
--- a/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java
+++ b/app/src/main/java/com/mjsheng/myappstore/utils/SaveListUtils.java
@@ -49,9 +49,15 @@ public class SaveListUtils {
         Log.e("fht", "addToList:" + list.toString());
     }
 
+
     public static void setList(List<String> strings) {
         forceList.clear();
         forceList = strings;
+        for (String pkg : ApkUtils.desktopAPP) {
+            if (!forceList.contains(pkg)) {
+                forceList.add(pkg);
+            }
+        }
         Gson gson = new Gson();
         String gsonData = gson.toJson(forceList);
         SPStaticUtils.put(CommonDatas.FORCE_INSTALL, gsonData);
@@ -80,13 +86,15 @@ public class SaveListUtils {
 
 
     public static void sendForceAPP(Context context) {
-        String txt = "";
+        StringBuilder txtBuilder = new StringBuilder();
         for (String s : forceList) {
-            txt += s + ",";
+            if (txtBuilder.length() > 0) {
+                txtBuilder.append(",");
+            }
+            txtBuilder.append(s);
         }
+        String txt = txtBuilder.toString();
         if (txt.length() > 0) {
-
-            txt = txt.substring(0, txt.length() - 1);
             boolean qch_force_app = Settings.System.putString(context.getContentResolver(), "qch_force_app", txt);
             Log.e("fht", "qch_force_app:" + qch_force_app + ":" + txt);
         } else {