From 7458216cbc9b2b812bbd949452c8d0e497552911 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Thu, 15 Oct 2026 14:34:27 +0800 Subject: [PATCH] =?UTF-8?q?feat(build):=20=E6=B7=BB=E5=8A=A0G122J=E5=B9=B3?= =?UTF-8?q?=E5=8F=B0=E6=9E=84=E5=BB=BA=E9=85=8D=E7=BD=AE=E5=B9=B6=E9=80=82?= =?UTF-8?q?=E9=85=8D=E5=B9=B3=E5=8F=B0=E9=80=BB=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- build.gradle | 23 ++++++++++++++++++ iconloaderlib/build.gradle | 2 ++ keystore/G122J.p12 | Bin 0 -> 2648 bytes .../os/network/NetInterfaceManager.java | 4 ++- .../aoleyun/os/touch/ItemClickHandler.java | 22 +++++++++-------- src/com/aoleyun/os/uiuiutils/JgyUtils.java | 8 +++++- 6 files changed, 47 insertions(+), 12 deletions(-) create mode 100644 keystore/G122J.p12 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 0000000000000000000000000000000000000000..6ece76dae00f76e70b0f5037255986bda7f00550 GIT binary patch literal 2648 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 literal 0 HcmV?d00001 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); }