From 6f605bb263f09f9baabdfb30991057d845988c55 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Wed, 6 Aug 2025 11:36:55 +0800 Subject: [PATCH] =?UTF-8?q?version:3.4.0=20fix:=20update:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0G12NL=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 33 ++++++++++++++++-- app/keystore/MT6789.keystore | Bin 0 -> 2345 bytes .../com/fuying/sn/config/CommonConfig.java | 4 ++- .../sn/network/NetInterfaceManager.java | 4 +++ .../java/com/fuying/sn/utils/JGYUtils.java | 8 +++++ 5 files changed, 46 insertions(+), 3 deletions(-) create mode 100644 app/keystore/MT6789.keystore diff --git a/app/build.gradle b/app/build.gradle index ca1b586..91323fa 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -74,8 +74,8 @@ android { official { flavorDimensions "default" - versionCode 79 - versionName "3.3.9" + versionCode 80 + versionName "3.4.0" } } @@ -189,9 +189,38 @@ android { v2SigningEnabled true } + MT6789 { + storeFile file("keystore/MT6789.keystore") + storePassword "123456" + keyAlias "mt6789" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + } buildTypes { + MT6789Debug.initWith(debug) + MT6789Debug { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"G12NL"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.MT6789 + } + + MT6789Release.initWith(release) + MT6789Release { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"G12NL"' + signingConfig signingConfigs.MT6789 + } + Huaruian8768Debug.initWith(debug) Huaruian8768Debug { manifestPlaceholders = [ diff --git a/app/keystore/MT6789.keystore b/app/keystore/MT6789.keystore new file mode 100644 index 0000000000000000000000000000000000000000..33a16e4b947589e29b32194ec14098ce407184aa GIT binary patch literal 2345 zcmd5-={wYI8=l|H7={^Q%9cUOzVsVpiA0gfzGcsnVMelqh-w;BmdH}sw=9W5Dr9U~ zCQD^s6OW4Q*@emW@*MB`9?ysO4|qRZAI|eW@8iCX^S+Mr+MVB>hd?0E{Q~|jgr~of zvWn_HOm>i|)r3HpU?3H~2eKnrr4axekb-go022gGh0nFd{WM8rzW;qOOEBw!-Ebve za*cKaz`S57-bKI|;4Z!$vmZLD5%ZFRb5?jtQW4XYI@~s0Dd3tl{YFjWg}6sVvte(H z^%YHj>kN*R@wl7brY7Cr?k#>Y)#=d=Ckqt0L$=x_%9L7AGZM*z<|2L=Wj>;s9)$ez0+^ncd93zrfI)gQ(ADdlF@lt zj|*&9^VjJ*dki1+W?S%bj<3W7Nyr##4OwY}l#dZwkf{d7^?vC^uU{d`MM^d*td}?C zuHJ3CVG!DY)r^@end=bz*bc>2mx`i3BJ@SwgHN8u`ZQ4R!ZJ2waSey}A7nz!X#Hi~ zuI!zy#y!_Id-Zg$u$Mpb!<^*iV<&7d3@jBhgL{)G3zFCeLI!S{HzuY?(M7+^-szSc z$KIQ6e-(3K!)Lqly9O&tDhbLqqf74+N^7WhB3&!=7NIx21mDBSh&&9z4k&e1AM)@}98Eqw@&%585YUvv3G2K>c{hC`=*?3b=cja_BxU#ELFK0WnHWU842$p%s zcGEwJL8}W)x9-l%`gOzeT&5J)i#STJY_}F%PPm%u2oP{-CY3yJkH^s0rzKyXizatn z^!u!vX?pCuhlaAQSav#k9dq%i?r+<~v>S+E+{|?cLI$N58~jn ztxgZZqTIyl9Hp6$)RuRxbKL#HBS*@upYpKUF4dhlX+&W7l}OGelMwCZ zxDZesEmu93u&stfCZEQC5~<8SS@wQ)j?=nLF?{jneCjR_qgH$K%WY~>wZQ4wTwY5x zxt;AM2)N9eY<;{u_OoxS14Z!RxQ%(z(xDni<_xL34hKgRUt6}6dF*3fzor+i(tL)p z<8bl!BmJAH=6&o}W*@;US7hd}(DN>k` z4j&7n=PP?Y0cF!ByiR#Fl~1-+>7v1aSR$YA+sR43N(1bzq3Q{_rt924htj=9lNzIy z_A*ACO8S^?d1)Ui_CaQ{B(e|`{T^^_=?URfSlz`D97+XAe?Fk`IU!ziq?!H(U&jE) zN(26Gj*8-t5yCOYR4ch6SQFw$(H4Dfu)HN;A?=U%vL9envNDya$wV}LSpRo4GFi)= z0{4><_6?-MhCwQno&|#fP$&{|ziiUCz_x_~q7g``Fnrhs8UWasAYjNn92GXprpy!BB95tEV?k7!>^Pqey_8^MKU!JhLKUi?FkC8^zhhujfCB|oKUenJuX z<{htpp!u2CExtONOoo&OmEL3()6Ml~&w*IVPm1cSjP->|*7$8b3;8&G?@oPsyw!l?=Rp(wtGtO|<<( z*|ndx+ma>a^5?8_>a7G=ol78_f3z{~A@R1lhge{vbPr!}SykV8hk+cO(cVJ8yId4A zbs#!^sBmw5}7XH>#Y6LYVm$VyYcyC6x*d&D_#9;+YL68Zo(S9LG@hhMoKAHQhl8X z;3_iGtlE?-gtgIu*1Q^-702w(ua1nOKcTu%BS^f(N}|=e8$CO)QNyE728+jr%oGJ| ztSIz}iSCT*Aex@t-KpDaS4H@@7`rR+73Q}e6UJqTQN%MMZ%Ri#%gQTm@NA{Ap+9&J VVheaDts-AKTGh=~C22ji{TCHX{K5bL literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/fuying/sn/config/CommonConfig.java b/app/src/main/java/com/fuying/sn/config/CommonConfig.java index 637b07b..2d39659 100644 --- a/app/src/main/java/com/fuying/sn/config/CommonConfig.java +++ b/app/src/main/java/com/fuying/sn/config/CommonConfig.java @@ -53,8 +53,10 @@ public class CommonConfig { public static final String AOLE_APP_WEB_WHITE_LIST = "app_web_white_list"; /*内部黑名单*/ public static final String AOLE_APP_WEB_BLACK_LIST = "app_web_black_list"; - /*应用安装白名单*/ + /*应用白名单安装总开关*/ public static final String AOLE_ACTION_APP_FORBID = "aole_app_forbid"; + /*应用安装白名单*/ + public static final String AOLE_APP_ALLOW_INSTALL = "aole_app_allow_install"; /*指定应用安装源 非指定包名不能安装apk*/ public static final String APP_SOURCE_WHITE_LIST = "app_source_white_list"; /*强制安装应用，禁止卸载*/ diff --git a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java index ddd8a96..d0cfcfe 100644 --- a/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java +++ b/app/src/main/java/com/fuying/sn/network/NetInterfaceManager.java @@ -719,6 +719,8 @@ public class NetInterfaceManager { set.add(JGYUtils.G6Tag); } else if (platform == JGYUtils.G11JPlatform) { set.add(JGYUtils.G11JTag); + } else if (platform == JGYUtils.G12NLPlatform) { + set.add(JGYUtils.G12NLTag); } }); clearAndAppendTags(set); @@ -746,6 +748,8 @@ public class NetInterfaceManager { set.add(JGYUtils.G6Tag); } else if (platform == JGYUtils.G11JPlatform) { set.add(JGYUtils.G11JTag); + } else if (platform == JGYUtils.G12NLPlatform) { + set.add(JGYUtils.G12NLTag); } }); XGPushManager.clearAndAppendTags(mContext, "clearAndAppendTags :" + System.currentTimeMillis(), set, new XGIOperateCallback() { diff --git a/app/src/main/java/com/fuying/sn/utils/JGYUtils.java b/app/src/main/java/com/fuying/sn/utils/JGYUtils.java index 409d78b..ad2034e 100644 --- a/app/src/main/java/com/fuying/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/fuying/sn/utils/JGYUtils.java @@ -101,6 +101,7 @@ public class JGYUtils { public static final int iPlay50SEPlatform = 8; public static final int G6Platform = 10; public static final int G11JPlatform = 11; + public static final int G12NLPlatform = 12; public static final String MTKTag = "MTK"; @@ -112,6 +113,7 @@ public class JGYUtils { public static final String iPlay50SETag = "ipaly50SE"; public static final String G6Tag = "G6"; public static final String G11JTag = "G10J"; + public static final String G12NLTag = " G12NL"; private HashSet ownApp = new HashSet() {{ @@ -542,6 +544,9 @@ public class JGYUtils { } else if (G11JTag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "G10J"); return G11JPlatform; + } else if (G12NLTag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "G12NL"); + return G12NLPlatform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -581,6 +586,8 @@ public class JGYUtils { getAppPlatformCallback.AppPlatform(G6Platform); } else if (G11JTag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(G11JPlatform); + } else if (G12NLTag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(G12NLPlatform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } @@ -595,6 +602,7 @@ public class JGYUtils { || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.iPlay50SEPlatform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G6Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G11JPlatform + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G12NLPlatform ) { return getProperty("ro.build.display.id", "获取失败"); } else {