From 020c85475ad701088159141d5c6693d873327e77 Mon Sep 17 00:00:00 2001 From: Fanhuitong <981964879@qq.com> Date: Fri, 24 Mar 2023 09:39:24 +0800 Subject: [PATCH] =?UTF-8?q?version:1.1.3=20fix:=20update:iplay50se?= =?UTF-8?q?=E9=80=82=E9=85=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 27 +++++++++- app/keystore/iPlay50SE.keystore | Bin 0 -> 2717 bytes .../network/NetInterfaceManager.java | 2 + .../com/uiui/zyappstore/utils/JGYUtils.java | 7 +++ .../java/com/uiui/zyappstore/utils/Utils.java | 49 ++++++++---------- 5 files changed, 56 insertions(+), 29 deletions(-) create mode 100644 app/keystore/iPlay50SE.keystore diff --git a/app/build.gradle b/app/build.gradle index f0bb2f4..72a1e2d 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -18,8 +18,8 @@ android { minSdkVersion 26 targetSdkVersion 29 - versionCode 1 - versionName "1.0" + versionCode 5 + versionName "1.1.3" testInstrumentationRunner "androidx.test.runner.AndroidJUnitRunner" @@ -70,6 +70,15 @@ android { v2SigningEnabled false } + iPlay50SE { + storeFile file("keystore/iPlay50SE.keystore") + storePassword "123456" + keyAlias "iplay50se" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } + zhanRui { storeFile file("keystore/zhanxun.keystore") storePassword "123456" @@ -109,6 +118,20 @@ android { signingConfig signingConfigs.teclast8183 } + iPlay50SEDebug.initWith(debug) + iPlay50SEDebug { + buildConfigField "String", "platform", '"ipaly50SE"' + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.iPlay50SE + } + + iPlay50SERelease.initWith(release) + iPlay50SERelease { + buildConfigField "String", "platform", '"ipaly50SE"' + signingConfig signingConfigs.iPlay50SE + } + zhanRuiDebug.initWith(debug) zhanRuiDebug { debuggable true diff --git a/app/keystore/iPlay50SE.keystore b/app/keystore/iPlay50SE.keystore new file mode 100644 index 0000000000000000000000000000000000000000..57f25214373c57f853a55218da54d97b8db56ff9 GIT binary patch literal 2717 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 Jhz=M<{s*yh`NseN literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java index 8307e5d..953c2b6 100644 --- a/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java +++ b/app/src/main/java/com/uiui/zyappstore/network/NetInterfaceManager.java @@ -212,6 +212,8 @@ public class NetInterfaceManager { set.add(JGYUtils.Cube8183Tag); }else if (platform == JGYUtils.Teclast8183Platform) { set.add(JGYUtils.TeclastMTK12Tag); + }else if (platform == JGYUtils.ipaly50SEPlatform) { + set.add(JGYUtils.ipaly50SETag); } }); setpushTag(set); diff --git a/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java index bb56fda..acc8fa8 100644 --- a/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/JGYUtils.java @@ -45,6 +45,7 @@ public class JGYUtils { public static final int UZY12Platform = 7; public static final int Cube8183Platform = 8; public static final int Teclast8183Platform = 9; + public static final int ipaly50SEPlatform = 10; public static final int UnknowPlatform = 0; public static final String MTKTag = "MTK"; @@ -54,6 +55,7 @@ public class JGYUtils { public static final String UZY12Tag = "UZY12"; public static final String Cube8183Tag = "cube8183"; public static final String TeclastMTK12Tag = "teclast8183"; + public static final String ipaly50SETag = "ipaly50SE"; private JGYUtils(Context context) { @@ -324,6 +326,9 @@ public class JGYUtils { } else if (TeclastMTK12Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "teclast8183"); return Teclast8183Platform; + }else if (ipaly50SETag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "ipaly50SE"); + return ipaly50SEPlatform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -359,6 +364,8 @@ public class JGYUtils { getAppPlatformCallback.AppPlatform(Teclast8183Platform); } else if (Cube8183Tag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(Cube8183Platform); + } else if (ipaly50SETag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(ipaly50SEPlatform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } diff --git a/app/src/main/java/com/uiui/zyappstore/utils/Utils.java b/app/src/main/java/com/uiui/zyappstore/utils/Utils.java index ff49a8f..625ae4d 100644 --- a/app/src/main/java/com/uiui/zyappstore/utils/Utils.java +++ b/app/src/main/java/com/uiui/zyappstore/utils/Utils.java @@ -649,36 +649,31 @@ public class Utils { context.startActivity(intent); } + /** + * 获取设备序列号 + * + * @return + */ + @SuppressLint({"MissingPermission", "NewApi"}) public static String getSerial() { - String mac = JGYUtils.getInstance().getPushMac(); - return mac; + 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; } -// /** -// * 获取设备序列号 -// * -// * @return -// */ -// @SuppressLint({"MissingPermission", "NewApi"}) -// public static String getSerial() { -// 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; -// } - /** * @param context 获取真实的MAC地址 * @return