diff --git a/app/build.gradle b/app/build.gradle index 3b8da6f..d8e8056 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { applicationId "com.aoleyun.sn" - versionCode 82 - versionName "6.4.2" + versionCode 83 + versionName "6.4.3" //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 24 @@ -155,6 +155,15 @@ android { keyPassword "123456" v2SigningEnabled false } + + //iPlay50 mini,iPlay50 android13 共用签名 + iPlay50mini { + storeFile file("keystore/iPlay50Mini.keystore") + storePassword "android" + keyAlias "platform" + keyPassword "android" + v2SigningEnabled false + } } // Disable release builds for now @@ -166,6 +175,20 @@ android { } buildTypes { + iPlay5013Debug.initWith(debug) + iPlay5013Debug { + buildConfigField "String", "platform", '"iplay5013"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.iPlay50mini + } + + iPlay5013Release.initWith(release) + iPlay5013Release { + buildConfigField "String", "platform", '"iplay5013"' + signingConfig signingConfigs.iPlay50mini + } + MTKAndroid12Debug.initWith(debug) MTKAndroid12Debug { versionNameSuffix "-debug" diff --git a/app/keystore/iPlay50Mini.keystore b/app/keystore/iPlay50Mini.keystore new file mode 100644 index 0000000..fa4d77f Binary files /dev/null and b/app/keystore/iPlay50Mini.keystore differ 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 5352875..6666f1a 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java @@ -16,6 +16,7 @@ import com.aoleyun.sn.comm.CommonConfig; import com.aoleyun.sn.comm.JGYActions; import com.aoleyun.sn.gson.GsonUtils; import com.google.gson.JsonArray; +import com.google.gson.JsonElement; import com.google.gson.JsonObject; import com.google.gson.JsonParser; @@ -59,6 +60,7 @@ public class SysSettingUtils { setBrowserInput(context, jsonObject); // TODO: 2022/4/11 不是酷比定制的会报错,无法抛出异常 setUSBstate(context, jsonObject); + setAdminApp(context, jsonObject); } /** @@ -83,6 +85,7 @@ public class SysSettingUtils { JGYUtils.getInstance().setDeveloperOptions(1); } setStatusBar(context, 1); + setAdminApp(context, 1); } /** @@ -104,6 +107,7 @@ public class SysSettingUtils { setBrowserInput(context, 0); JGYUtils.getInstance().setDeveloperOptions(0); setStatusBar(context, 0); + setAdminApp(context, 0); } private static void setPhoneList(Context context, int state) { @@ -796,4 +800,37 @@ public class SysSettingUtils { Settings.System.putInt(context.getContentResolver(), "qch_Browser_input", 0); Settings.Global.putInt(context.getContentResolver(), "is_browser_network", changeNum(state)); } + + private static void setAdminApp(Context context, JsonObject jsonObject) { + JsonElement appInstall = jsonObject.get("is_app_install"); + if (appInstall != null) { + int is_app_install = appInstall.getAsInt(); + Log.e(TAG, "setAdminApp: is_admin_app = " + is_app_install); + Settings.System.putInt(context.getContentResolver(), "aole_app_allow_install", changeNum(is_app_install)); + } else { + Settings.System.putInt(context.getContentResolver(), "aole_app_allow_install", 1); + } + + JsonElement adminApp = jsonObject.get("is_admin_app"); + if (adminApp != null) { + int is_admin_app = adminApp.getAsInt(); + Log.e(TAG, "setAdminApp: is_admin_app = " + is_admin_app); + Settings.Global.putInt(context.getContentResolver(), "is_admin_app", is_admin_app); + } else { + Settings.Global.putInt(context.getContentResolver(), "is_admin_app", 0); + } + JsonElement appCategory = jsonObject.get("admin_app_category"); + if (appCategory != null && !appCategory.isJsonNull()) { + String admin_app_category = appCategory.getAsString(); + Settings.Global.putString(context.getContentResolver(), "admin_app_category", admin_app_category); + } else { + Settings.Global.putString(context.getContentResolver(), "admin_app_category", ""); + } + } + + private static void setAdminApp(Context context, int state) { + Log.e(TAG, "setAdminApp: state = " + state); + Settings.Global.putInt(context.getContentResolver(), "is_admin_app", state); + Settings.System.putInt(context.getContentResolver(), "aole_app_allow_install", changeNum(state)); + } }