From 129f47f9f090a8b987377d83f21aee96ef9af9b5 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Mon, 11 Sep 2023 18:24:21 +0800 Subject: [PATCH] =?UTF-8?q?version:6.4.3=20fix:=20update:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0=E7=99=BD=E5=90=8D=E5=8D=95=E5=BC=80=E5=85=B3=E5=92=8C?= =?UTF-8?q?=E5=BA=94=E7=94=A8=E7=AE=A1=E6=8E=A7=E5=88=86=E7=B1=BB=E5=92=8C?= =?UTF-8?q?=E5=BC=80=E5=85=B3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 27 ++++++++++++- app/keystore/iPlay50Mini.keystore | Bin 0 -> 2347 bytes .../com/aoleyun/sn/utils/SysSettingUtils.java | 37 ++++++++++++++++++ 3 files changed, 62 insertions(+), 2 deletions(-) create mode 100644 app/keystore/iPlay50Mini.keystore 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 0000000000000000000000000000000000000000..fa4d77fe448d3c728b256310abbc354ea176d49a GIT binary patch literal 2347 zcmd5-_fu2b8a*cs5=baPdhdjG=+#2Kdg&q%2zV(X2!v3iT)F{~B8C=G5%4OgAV^U_ zkVujCXd)<56a}Oxh=L&9Jh=1j8-I9zz}qux_Izut+54L{-|YSK%g-+W0KoPE{teck z0FU!$DIw&2;!@7gU?Kn@;Sd$Ugm5T~A__!+1Q-_xA^`*yvFMg%9&#)>J*nqzL51F~ zsZ+O^3Q4M}B3vkiW7_v%N@#j}TNDjqau&l2se z+?RZ$ck;#E8l~s6f{n5@ii@V2-*pCE$=!-_jhR`_t+n{v`1X5mom4eWUE>h4RJ51Ds(AaH5@%&CUAqu7!`?IQm( z%!t^(G+*$9OLE|gJ_(O=H7d9M@M|lgZiG|^GJpS$3frw!LiJ87c!e1(28M(UnWEZE ziz*qPku6GnGP-dEM%ZTAH#x{JK;5L@3b)PM>Sw~M$AYh@m|14FmZj>_imX(1+q{L1 z8(J)SfIo4Hf?zY_{6bpN@#|Yh$)&RQ0N22pTCSm;#LvF%^+${rYiwpis~>EH7i&5N za4LF~ZWu?_5Vx%`$kPJcO`Zl^bJyY!HYanWEfY}_Y%0v6>!!~LC6lxM3__ghZUd{f;zX2Py-HE zAV>*S)x~`-2(gQ4JZt{;O&w=)K^%Gg?#H$6si?m7L)#XlOdY|AQX-GFL3Ns$-OBt2 z=>~6%12N1dometXN5pUSYS9|=Ui6=m(BXGEa&(}xnknD4b8n~w>Gf@rYxi7h{(T~g z&NSu6_)uG?zeD#(p)-?lnly^`_QM}X+f3#<0G%dpxc5O$Q9E*J^-k8&3OgiiCZqUAK>xh% z+Q593pCKfiN`Twk$dCdFatn0H=%X@IR23hs)fvuf8aTb--klKgas%gyWk}v{hPwu~ z#YnIH=*LmLt&J0}yt?RW>6&-b>`9`lF?^x42=DBn0VrsiO#qoPUXc)Haxw4g0aK(MHk4~{A-!*qLlzQ$u6)z!sVf@9d z4w@nAj4tn)Nto9T-M3zz8zGCb?%iw%$`mCGT?HaX zx&wQ=u25Ft;RgLNKxlQer&fBPa>)MEtdop%j^$+ON81yFhn%p&d`-(W58l8%c`&fn zNk!q6nFVx|%#&WQrhb&SvoooW^qtQkBt0jW^THkU%dDMsf0SO~?O~k$!rzZ0lBl8u z=>Y)zJw%01KvdZCTW}Z%gQ0;k2h++v8eb2DMWG4F$CEd(AjpOUpbLp=Y!Dg+cR--< zFcWJvE{NlxU}a~u_w^2R*~dQ=%P$lbVmokQ*b!b~p5FhQz{Um+Bcu~k|LXg0JZ$^W>><7XzHFfO+5fbIYs;lj<{pK|xO~{20tEsoYtN*9`Kk1SR zO8y$({vQLUf*b%u1u-xx2m)`;;zkR9JF-9qz z)~S($U?P7?h^kCyWps%u!KoZYM@d3qedS&o+pAiJRs+o0PzKvXCbL=2nIu=8<6}Us zEZdbD6?I#~Zq2A(Uftzd3qz-OSSF9qS#In3&Gq#B&^QvSL~pZD*UI@!4~teS`KJBQ zboumPk1vW7(VCqM*;;6?D{zl}*#>J}ADjER^rFFCSww_-I0 z5<8Hk5d08t!v8j~9~kfmBm@UR=C7IWkL-TtAP^BFUBk1L$wN>x%JUA5EFUZSv|Z1H z>(2w_?L*rcBOQ6MN~Z-D9sj)UJDcy7^Rpl|v?S)awW_&qPHw7{%DVpbAPu<+?lwmc zlQaRJ;eZxTih_J=ZPjZ!YPMTkUgD#f#eL_ISw^h^d&Ci|R3(zR9d&6BG@mcNt8v)% z^XrRPUj4y%c!)_p<*(9M!@ls|W}1FPre)Ax!f&tCl>C(ltg|NWIB|q%VK7GjH(Pd; zRPdASwnrwNQ6smj(0N_>;ub?c^keuRE<|v`$Mz{shLN6<8T1ZrbXdnwEXGao#z`&%eROkzrxJu!xcrLq|c{2Sdj?YRH| literal 0 HcmV?d00001 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)); + } }