diff --git a/build.gradle b/build.gradle index 2a27fe4..f75a86b 100644 --- a/build.gradle +++ b/build.gradle @@ -283,9 +283,32 @@ android { v1SigningEnabled true v2SigningEnabled true } + + G122J { + storeFile file("keystore/G122J.p12") + storePassword "123456" + keyAlias "g122j" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { + G122JDebug.initWith(debug) + G122JDebug { + buildConfigField "String", "platform", '"G122J"' + versionNameSuffix "_debug" + debuggable true + signingConfig signingConfigs.G122J + } + + G122JRelease.initWith(release) + G122JRelease { + buildConfigField "String", "platform", '"G122J"' + signingConfig signingConfigs.G122J + } + G12NLDebug.initWith(debug) G12NLDebug { buildConfigField "String", "platform", '"G12NL"' diff --git a/iconloaderlib/build.gradle b/iconloaderlib/build.gradle index 74810bb..2d047ce 100644 --- a/iconloaderlib/build.gradle +++ b/iconloaderlib/build.gradle @@ -15,6 +15,8 @@ android { } buildTypes { + G122JDebug {} + G122JRelease {} MX11Debug {} MX11Release {} G12NLDebug {} diff --git a/keystore/G122J.p12 b/keystore/G122J.p12 new file mode 100644 index 0000000..6ece76d Binary files /dev/null and b/keystore/G122J.p12 differ diff --git a/src/com/aoleyun/os/network/NetInterfaceManager.java b/src/com/aoleyun/os/network/NetInterfaceManager.java index b57a90d..fae5f3e 100644 --- a/src/com/aoleyun/os/network/NetInterfaceManager.java +++ b/src/com/aoleyun/os/network/NetInterfaceManager.java @@ -208,12 +208,14 @@ public class NetInterfaceManager { set.add(JgyUtils.AUDG104Tag); } else if (platform == JgyUtils.seewoPlatform) { set.add(JgyUtils.seewoTag); - } else if (platform == JgyUtils.QualcommPlatform) { + } else if (platform == JgyUtils.QualcommPlatform) { set.add(JgyUtils.Qualcomm_TAG); } else if (platform == JgyUtils.DX11Platform) { set.add(JgyUtils.DX11_TAG); } else if (platform == JgyUtils.G12NLPlatform) { set.add(JgyUtils.G12NL_TAG); + } else if (platform == JgyUtils.G122JPlatform) { + set.add(JgyUtils.G122J_TAG); } } }); diff --git a/src/com/aoleyun/os/touch/ItemClickHandler.java b/src/com/aoleyun/os/touch/ItemClickHandler.java index 0251f76..8c360dc 100644 --- a/src/com/aoleyun/os/touch/ItemClickHandler.java +++ b/src/com/aoleyun/os/touch/ItemClickHandler.java @@ -111,16 +111,18 @@ public class ItemClickHandler { Object tag = v.getTag(); - // 点击系统设置时,重定向到 onyx 设置页面 - String pkgName = getTagPackageName(tag); - if ("com.android.settings".equals(pkgName)) { - Intent onyxSettingsIntent = new Intent(); - onyxSettingsIntent.setComponent( - new ComponentName("com.onyx", "com.onyx.tablet.settings.SettingsActivity")); - onyxSettingsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); - launcher.startActivitySafely(v, onyxSettingsIntent, - tag instanceof ItemInfo ? (ItemInfo) tag : null, sourceContainer); - return; + if (JgyUtils.getInstance().checkAppPlatform() == JgyUtils.QualcommPlatform) { + // 点击系统设置时,重定向到 onyx 设置页面 + String pkgName = getTagPackageName(tag); + if ("com.android.settings".equals(pkgName)) { + Intent onyxSettingsIntent = new Intent(); + onyxSettingsIntent.setComponent( + new ComponentName("com.onyx", "com.onyx.tablet.settings.SettingsActivity")); + onyxSettingsIntent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK); + launcher.startActivitySafely(v, onyxSettingsIntent, + tag instanceof ItemInfo ? (ItemInfo) tag : null, sourceContainer); + return; + } } if (tag instanceof WorkspaceItemInfo) { diff --git a/src/com/aoleyun/os/uiuiutils/JgyUtils.java b/src/com/aoleyun/os/uiuiutils/JgyUtils.java index 08bf171..ca62de9 100644 --- a/src/com/aoleyun/os/uiuiutils/JgyUtils.java +++ b/src/com/aoleyun/os/uiuiutils/JgyUtils.java @@ -48,6 +48,7 @@ public class JgyUtils { public static final int QualcommPlatform = 30; public static final int DX11Platform = 31; public static final int G12NLPlatform = 32; + public static final int G122JPlatform = 34; public static final String Other = "其他"; @@ -69,7 +70,7 @@ public class JgyUtils { public static final String Qualcomm_TAG = "QualcommA"; public static final String DX11_TAG = "DX11"; public static final String G12NL_TAG = "G12NL"; - + public static final String G122J_TAG = "G122J"; private JgyUtils(Context context) { if (context == null) { @@ -136,6 +137,9 @@ public class JgyUtils { } else if (G12NL_TAG.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "G12NL"); return G12NLPlatform; + } else if (G122J_TAG.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "G122J"); + return G122JPlatform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -176,6 +180,8 @@ public class JgyUtils { getAppPlatformCallback.AppPlatform(DX11Platform); } else if (G12NL_TAG.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(G12NLPlatform); + } else if (G122J_TAG.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(G122JPlatform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); }