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 0000000..33a16e4 Binary files /dev/null and b/app/keystore/MT6789.keystore differ 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 {