From 7599d14897e02621f2bcf1938c438846c64212ad Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Tue, 1 Apr 2025 18:18:32 +0800 Subject: [PATCH] =?UTF-8?q?1.5.0328=20bugfixes:=E5=A2=9E=E5=8A=A0=E5=B8=8C?= =?UTF-8?q?=E6=B2=83=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 41 ++++++++++++++---- app/keystore/aiud.keystore | Bin 0 -> 3982 bytes .../sn/activity/main/MainViewModel.java | 2 - .../sn/network/NetInterfaceManager.java | 13 +++--- .../java/com/aoleyun/sn/utils/JgyUtils.java | 15 ++++++- .../com/aoleyun/sn/utils/SysSettingUtils.java | 2 +- .../main/java/com/aoleyun/sn/utils/Utils.java | 1 + 7 files changed, 53 insertions(+), 21 deletions(-) create mode 100644 app/keystore/aiud.keystore diff --git a/app/build.gradle b/app/build.gradle index 373a82e..b464664 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { applicationId "com.aoleyun.sn" - versionCode 169 - versionName "1.4.1217" + versionCode 170 + versionName "1.5.0328" //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 24 @@ -73,6 +73,14 @@ android { // newly.res.srcDirs = ['src/beta/res'] } + // Disable release builds for now + android.variantFilter { variant -> +// // Icon recents is Go only +// if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) { +// variant.setIgnore(true) +// } + } + //签名 signingConfigs { zhanRui { @@ -216,17 +224,32 @@ android { v1SigningEnabled true v2SigningEnabled true } - } - // Disable release builds for now - android.variantFilter { variant -> -// // Icon recents is Go only -// if (name.contains("WithQuickstepIconRecents") && !name.contains("l3go")) { -// variant.setIgnore(true) -// } + seewo { + storeFile file("keystore/aiud.keystore") + storePassword "s4HdJuphaiHhU7WY" + keyAlias "androidreleasekey" + keyPassword "JwUw2oV16rUjWLBC" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + seewoDebug.initWith(debug) + seewoDebug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.seewo + buildConfigField "String", "platform", '"seewo"' + } + + seewoRelease.initWith(release) + seewoRelease { + signingConfig signingConfigs.seewo + buildConfigField "String", "platform", '"seewo"' + } + P50Debug.initWith(debug) P50Debug { versionNameSuffix "-debug" diff --git a/app/keystore/aiud.keystore b/app/keystore/aiud.keystore new file mode 100644 index 0000000000000000000000000000000000000000..5ac03d9ef93c0ba88335302c1ff2c60f91842bbc GIT binary patch literal 3982 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java index c853161..1f8775c 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainViewModel.java @@ -308,7 +308,6 @@ public class MainViewModel extends BaseViewModel(tagSets).toArray(new String[tagSets.size()]); CloudPushService pushService = PushServiceFactory.getCloudPushService(); 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 9154b10..2b6be63 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JgyUtils.java @@ -155,6 +155,7 @@ public class JgyUtils { public static final int HL500Platform = 20; public static final int G11JPlatform = 21; public static final int P50Platform = 23; + public static final int seewoPlatform = 25; public static final String Other = "其他"; @@ -176,6 +177,7 @@ public class JgyUtils { public static final String HL500Tag = "HL500"; public static final String G11JTag = "aud8786"; public static final String P50Tag = "P50TD"; + public static final String seewoTag = "seewo"; private CacheHelper cacheHelper; @@ -315,6 +317,9 @@ public class JgyUtils { } else if (P50Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "P50TD"); return P50Platform; + } else if (seewoTag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "seewo"); + return seewoPlatform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -373,7 +378,9 @@ public class JgyUtils { getAppPlatformCallback.AppPlatform(G11JPlatform); } else if (P50Tag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(P50Platform); - }else { + } else if (seewoTag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(seewoPlatform); + } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } } @@ -630,6 +637,11 @@ public class JgyUtils { } public void onBootOpenApp() { + if ("G1096JW".equals(Build.MODEL)) { + if (ApkUtils.isAvailable(mContext, "com.aisudu.xhb")) { + ApkUtils.openPackage(mContext, "com.aisudu.xhb"); + } + } String qch_app_power_on = Settings.System.getString(crv, CommonConfig.AOLE_ACTION_APP_POWER_ON); if (TextUtils.isEmpty(qch_app_power_on)) { return; @@ -1347,7 +1359,6 @@ public class JgyUtils { } public void SettingSysData(String data) { - SPUtils.put(mContext, "SystemSettingData", data); if (TextUtils.isEmpty(data)) { Log.e(TAG, "SettingSysData: " + "data is empty"); SysSettingUtils.setDisableSetting(mContext); 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 0d23907..b2fa638 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java @@ -134,7 +134,7 @@ public class SysSettingUtils { setNotification(context, 1); } - private static void openMtp(Context context) { + public static void openMtp(Context context) { String usbStatus = CommonConfig.AOLE_ACTION_USB_USB_MTP; Intent usbIntent = new Intent(usbStatus); context.sendBroadcast(usbIntent); diff --git a/app/src/main/java/com/aoleyun/sn/utils/Utils.java b/app/src/main/java/com/aoleyun/sn/utils/Utils.java index a617812..d5d4dcf 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java @@ -1818,6 +1818,7 @@ public class Utils { || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.HL500Platform || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.G11JPlatform || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.P50Platform + || JgyUtils.getInstance().checkAppPlatform() == JgyUtils.seewoPlatform ) { return Utils.getProperty("ro.build.display.id", "获取失败"); } else {