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 0000000..5ac03d9 Binary files /dev/null and b/app/keystore/aiud.keystore differ 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 {