From 6b9a1d99b538baa76d8c11f2db3044c5dfe46da3 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Sun, 14 May 2023 11:27:45 +0800 Subject: [PATCH] =?UTF-8?q?version:m40se=202.9.8=20fix:=20update:=E5=A2=9E?= =?UTF-8?q?=E5=8A=A0G13=E5=92=8CP30Pro=E5=B9=B3=E5=8F=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 68 +++++++++++++++++- app/keystore/G10PMTK11.jks | Bin 0 -> 2352 bytes app/keystore/Teclast8515.keystore | Bin 0 -> 2356 bytes .../fuying/sn/activity/main/MainActivity.java | 12 ++-- .../sn/network/NetInterfaceManager.java | 4 ++ .../java/com/fuying/sn/utils/JGYUtils.java | 39 +++++++--- .../main/java/com/fuying/sn/utils/Utils.java | 41 ++++++----- .../main/res/layout-land/activity_main.xml | 21 ++---- .../main/res/layout-port/activity_main.xml | 17 +---- 9 files changed, 134 insertions(+), 68 deletions(-) create mode 100644 app/keystore/G10PMTK11.jks create mode 100644 app/keystore/Teclast8515.keystore diff --git a/app/build.gradle b/app/build.gradle index 2663b64..da13d63 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -73,8 +73,8 @@ android { official { flavorDimensions "default" - versionCode 37 - versionName "2.9.7" + versionCode 38 + versionName "2.9.8" } } @@ -142,11 +142,32 @@ android { v1SigningEnabled true v2SigningEnabled true } + + G10P{ + storeFile file("keystore/G10PMTK11.jks") + storePassword "123456" + keyAlias "G10PMTK11" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + + Teclast8515{ + storeFile file("keystore/Teclast8515.keystore") + storePassword "123456" + keyAlias "Teclast8515" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } buildTypes { unisocDebug.initWith(debug) unisocDebug { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] buildConfigField "String", "platform", '"ZhanRui"' versionNameSuffix "-debug" debuggable true @@ -155,6 +176,9 @@ android { unisocRelease.initWith(debug) unisocRelease { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] buildConfigField "String", "platform", '"ZhanRui"' debuggable true signingConfig signingConfigs.unisoc @@ -200,6 +224,46 @@ android { signingConfig signingConfigs.teclastMTK } + G13Debug.initWith(debug) + G13Debug { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"G13"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.G10P + } + + G13Release.initWith(release) + G13Release { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"G13"' + signingConfig signingConfigs.G10P + } + + Teclast8515Debug.initWith(debug) + Teclast8515Debug { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"8515"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.Teclast8515 + } + + Teclast8515Release.initWith(release) + Teclast8515Release { + manifestPlaceholders = [ + AK: "7IubK1Ugeuxga4KKC5VQyjTeQlExsYZq" + ] + buildConfigField "String", "platform", '"8515"' + signingConfig signingConfigs.Teclast8515 + } + teclastUnisocdebug.initWith(zhanRuiDebug) teclastUnisocdebug { manifestPlaceholders = [ diff --git a/app/keystore/G10PMTK11.jks b/app/keystore/G10PMTK11.jks new file mode 100644 index 0000000000000000000000000000000000000000..324fa3165901bfe56095885d02ba319749535507 GIT binary patch literal 2352 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 ownApp = new HashSet() {{ this.add("com.android.settings"); @@ -488,6 +493,12 @@ public class JGYUtils { } else if ("T30PRO".equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "T30PRO"); return T30ProPlatform; + } else if (MTK8515Tag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "8515"); + return MTK8515Platform; + } else if (G13Tag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "G13"); + return G13Platform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -509,23 +520,29 @@ public class JGYUtils { public void getAppPlatform(GetAppPlatformCallback getAppPlatformCallback) { String platform = BuildConfig.platform; - if ("MTK".equalsIgnoreCase(platform)) { + if (MTKTag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(MTKPlatform); } else if ("ZhanRui".equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(ZhanruiPlatform); - }else if ("M40SE".equalsIgnoreCase(platform)) { + } else if (M40SETag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(M40sePlatform); - } else if ("T30PRO".equalsIgnoreCase(platform)) { + } else if (T30PROTag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(T30ProPlatform); - } else { + } else if (MTK8515Tag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(MTK8515Platform); + } else if (G13Tag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(G13Platform); + } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } } public static String getCustomVersion() { if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform - ||JGYUtils.getInstance().checkAppPlatform() == JGYUtils.M40sePlatform - ||JGYUtils.getInstance().checkAppPlatform() == JGYUtils.T30ProPlatform + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.M40sePlatform + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.T30ProPlatform + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.MTK8515Platform + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G13Platform ) { return getProperty("ro.build.display.id", "获取失败"); } else { @@ -535,7 +552,7 @@ public class JGYUtils { public static String getRomVersion() { if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.ZhanruiPlatform - ||JGYUtils.getInstance().checkAppPlatform() == JGYUtils.M40sePlatform) { + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.M40sePlatform) { return getProperty("ro.build.id", "获取失败"); } else { return getProperty("ro.build.display.id", "获取失败"); diff --git a/app/src/main/java/com/fuying/sn/utils/Utils.java b/app/src/main/java/com/fuying/sn/utils/Utils.java index 9520f20..8695ca0 100644 --- a/app/src/main/java/com/fuying/sn/utils/Utils.java +++ b/app/src/main/java/com/fuying/sn/utils/Utils.java @@ -616,23 +616,30 @@ public class Utils { */ @SuppressLint({"MissingPermission", "NewApi"}) public static String getSerial() { - return JGYUtils.getInstance().getIMEI(); -// String serial = "unknow"; -// try { -// if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ -// serial = Build.getSerial(); -// } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ -// serial = Build.SERIAL; -// } else {//8.0- -// Class c = Class.forName("android.os.SystemProperties"); -// Method get = c.getMethod("get", String.class); -// serial = (String) get.invoke(c, "ro.serialno"); -// } -// } catch (Exception e) { -// e.printStackTrace(); -// Log.e("e", "读取设备序列号异常：" + e.toString()); -// } -// return serial; + if (JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G13Platform) { + return getSn(); + } else { + return JGYUtils.getInstance().getIMEI(); + } + } + + public static String getSn() { + String serial = "unknow"; + try { + if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.P) {//9.0+ + serial = Build.getSerial(); + } else if (Build.VERSION.SDK_INT > Build.VERSION_CODES.N) {//8.0+ + serial = Build.SERIAL; + } else {//8.0- + Class c = Class.forName("android.os.SystemProperties"); + Method get = c.getMethod("get", String.class); + serial = (String) get.invoke(c, "ro.serialno"); + } + } catch (Exception e) { + e.printStackTrace(); + Log.e("e", "读取设备序列号异常：" + e.toString()); + } + return serial; } /** diff --git a/app/src/main/res/layout-land/activity_main.xml b/app/src/main/res/layout-land/activity_main.xml index 5d1094d..7fbf6af 100644 --- a/app/src/main/res/layout-land/activity_main.xml +++ b/app/src/main/res/layout-land/activity_main.xml @@ -101,19 +101,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/qr_code" /> - - diff --git a/app/src/main/res/layout-port/activity_main.xml b/app/src/main/res/layout-port/activity_main.xml index f519f9b..bf03a14 100644 --- a/app/src/main/res/layout-port/activity_main.xml +++ b/app/src/main/res/layout-port/activity_main.xml @@ -101,19 +101,6 @@ app:layout_constraintStart_toStartOf="parent" app:layout_constraintTop_toBottomOf="@+id/qr_code" /> - -