From 08f58678645a8d94fc0c49d19d3d225b6d170795 Mon Sep 17 00:00:00 2001
From: Fanhuitong <981964879@qq.com>
Date: Tue, 2 Apr 2024 16:25:55 +0800
Subject: [PATCH] =?UTF-8?q?1.4.0329=20G10p=E5=A2=9E=E5=8A=A0=20com.gaomuxu?=
 =?UTF-8?q?exi34?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/build.gradle                                       |  4 ++--
 app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java   | 10 ++++++++--
 .../java/com/aoleyun/sn/utils/SysSettingUtils.java     |  6 +++---
 3 files changed, 13 insertions(+), 7 deletions(-)

diff --git a/app/build.gradle b/app/build.gradle
index a5e60f2..4b49a2a 100644
--- a/app/build.gradle
+++ b/app/build.gradle
@@ -29,8 +29,8 @@ android {
 
     defaultConfig {
         applicationId "com.aoleyun.sn"
-        versionCode 116
-        versionName "1.4.0320"
+        versionCode 118
+        versionName "1.4.0329"
 
         //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature.
         minSdkVersion 24
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 7ec896e..8eb733b 100644
--- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java
@@ -1258,9 +1258,12 @@ public class JGYUtils {
         if ("G23".equals(Build.MODEL)) {
             pkgSet.addAll(ApkUtils.zhengwu);
         }
-        if (JGYUtils.getInstance().checkAppPlatform()==JGYUtils.YXPD1Platform){
+        if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.YXPD1Platform) {
             pkgSet.add("com.tencent.wemeet.app");
         }
+        if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G10PPlatform) {
+            pkgSet.add("com.gaomuxuexi34");
+        }
         pkgSet.removeIf(TextUtils::isEmpty);
         if (JGYUtils.C2Tag.equalsIgnoreCase(JGYUtils.getInstance().getAppPlatform())) {
             pkgSet.remove("com.tencent.mm");
@@ -1292,9 +1295,12 @@ public class JGYUtils {
         if ("G23".equals(Build.MODEL)) {
             pkgSet.addAll(ApkUtils.zhengwu);
         }
-        if (JGYUtils.getInstance().checkAppPlatform()==JGYUtils.YXPD1Platform){
+        if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.YXPD1Platform) {
             pkgSet.add("com.tencent.wemeet.app");
         }
+        if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G10PPlatform) {
+            pkgSet.add("com.gaomuxuexi34");
+        }
         if (JGYUtils.C2Tag.equalsIgnoreCase(JGYUtils.getInstance().getAppPlatform())) {
             pkgSet.remove("com.tencent.mm");
         }
diff --git a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
index 77f93b3..25c4362 100644
--- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
+++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java
@@ -874,9 +874,9 @@ public class SysSettingUtils {
                 }
             }
             int is_storeinstall = snSetting.getIs_storeinstall();
-            Settings.Global.putInt(context.getContentResolver(), CommonConfig.AOLEYUN_APPSTORE_INSTALL, is_storeinstall);
+            Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, is_storeinstall);
             int is_usb = snSetting.getIs_usb();
-            setUsb(context, changeNum(is_usb));
+            setUsb(context, is_usb);
             int is_bluetooth_file = snSetting.getIs_bluetooth_file();
             setBluetooth(context, changeNum(is_bluetooth_file));
             int is_developer = snSetting.getIs_developer();
@@ -896,7 +896,7 @@ public class SysSettingUtils {
             if (null != c) {
                 Log.e("getTimeControl", c.toString());
             }
-            Settings.Global.putInt(context.getContentResolver(), CommonConfig.AOLEYUN_APPSTORE_INSTALL, 1);
+            Settings.Global.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, 1);
             setUsb(context, 0);
             setBluetooth(context, 0);
             int status = Settings.System.getInt(context.getContentResolver(), CommonConfig.AOLE_ACTION_DEVELOPER_OPTIONS, 1);