From c360344acc96f9a5916b216a3a4c58ce9f9e32e5 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Tue, 15 Oct 2024 09:30:58 +0800 Subject: [PATCH] =?UTF-8?q?1.4.1014=20bugfixes:=E4=BF=AE=E5=A4=8D=E5=BA=94?= =?UTF-8?q?=E7=94=A8=E5=AE=89=E8=A3=85=E5=BC=80=E5=85=B3=E9=97=AE=E9=A2=98?= =?UTF-8?q?=EF=BC=8C=E4=BF=AE=E6=94=B9=E6=89=93=E5=BC=80=E4=B9=8B=E5=90=8E?= =?UTF-8?q?=E4=B8=8D=E4=BC=9A=E5=88=A0=E9=99=A4=E5=BA=94=E7=94=A8=EF=BC=8C?= =?UTF-8?q?id=E7=AE=A1=E6=8E=A7=E9=BB=98=E8=AE=A4=E5=86=99=E5=85=A5?= =?UTF-8?q?=E4=B8=80=E6=9D=A1=E6=97=A0=E6=95=88=E6=95=B0=E6=8D=AE=EF=BC=8C?= =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E5=BA=94=E7=94=A8=E5=AE=89=E8=A3=85=E4=B9=8B?= =?UTF-8?q?=E5=90=8E=E4=B8=8D=E8=83=BD=E8=81=94=E7=BD=91=E7=9A=84=E9=97=AE?= =?UTF-8?q?=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 27 ++++- app/keystore/T40Air.jks | Bin 0 -> 2354 bytes .../sn/activity/main/MainActivity.java | 2 +- .../sn/hook/AoleyunActivityController.java | 5 + .../sn/network/NetInterfaceManager.java | 50 +++++--- .../interceptor/RepeatRequestInterceptor.java | 2 +- .../java/com/aoleyun/sn/push/PushManager.java | 2 +- .../aoleyun/sn/receiver/NewAppReceiver.java | 4 +- .../com/aoleyun/sn/service/LogcatService.java | 3 +- .../java/com/aoleyun/sn/utils/JGYUtils.java | 107 +++++++++++++----- .../com/aoleyun/sn/utils/SysSettingUtils.java | 5 +- .../main/java/com/aoleyun/sn/utils/Utils.java | 4 + 12 files changed, 158 insertions(+), 53 deletions(-) create mode 100644 app/keystore/T40Air.jks diff --git a/app/build.gradle b/app/build.gradle index 2f6aa57..2d2e30e 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -29,8 +29,8 @@ android { defaultConfig { applicationId "com.aoleyun.sn" - versionCode 157 - versionName "1.4.0913" + versionCode 161 + versionName "1.4.1014" //There are no CERT files because If the mini sdk version is 23+, the AGP will ignore the V1 scheme signature. minSdkVersion 24 @@ -198,6 +198,15 @@ android { v1SigningEnabled true v2SigningEnabled true } + + T40Air { + storeFile file("keystore/T40Air.jks") + storePassword "123456" + keyAlias "T40Air" + keyPassword "123456" + v1SigningEnabled true + v2SigningEnabled true + } } // Disable release builds for now @@ -209,6 +218,20 @@ android { } buildTypes { + T40AirDebug.initWith(debug) + T40AirDebug { + versionNameSuffix "-debug" + debuggable true + signingConfig signingConfigs.T40Air + buildConfigField "String", "platform", '"HL500"' + } + + T40AirRelease.initWith(release) + T40AirRelease { + signingConfig signingConfigs.T40Air + buildConfigField "String", "platform", '"HL500"' + } + AiUduDebug.initWith(debug) AiUduDebug { versionNameSuffix "-debug" diff --git a/app/keystore/T40Air.jks b/app/keystore/T40Air.jks new file mode 100644 index 0000000000000000000000000000000000000000..04a061ac217c81e9c9f8e8af303bcc96a513d052 GIT binary patch literal 2354 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 literal 0 HcmV?d00001 diff --git a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java index 63d4b89..873f605 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/main/MainActivity.java @@ -138,7 +138,7 @@ public class MainActivity extends BaseMvvmActivity appIDList = baseResponse.data; cacheHelper.put(UrlAddress.GET_APPID, GsonUtils.toJSONString(appIDList)); - JGYUtils.getInstance().writeDeselectIDtoSystem(appIDList); + +// JGYUtils.getInstance().writeDeselectIDtoSystem(appIDList); } else { cacheHelper.put(UrlAddress.GET_APPID, ""); - JGYUtils.getInstance().writeDeselectIDtoSystem(null); +// JGYUtils.getInstance().writeDeselectIDtoSystem(null); } } @@ -1908,19 +1910,9 @@ public class NetInterfaceManager { Log.e("getSnAppAttr", "onNext: " + baseResponse); if (baseResponse.code == 200) { List appAttrList = baseResponse.data; - if (appAttrList == null || appAttrList.size() == 0) { - Log.e("getSnAppAttr", "onNext: appAttrList is empty"); - Settings.Global.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP, "null"); - } else { - String disableApp = appAttrList.stream() - .filter(appAttr -> appAttr.getIs_open() == 0) - .map(AppAttr::getApp_package) - .collect(Collectors.joining(",")); - Log.e("getSnAppAttr", "onNext: disableApp = " + disableApp); - Settings.Global.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP, disableApp); - } + setAppDisAble(appAttrList); } else { - Settings.Global.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP, "null"); + setAppDisAble(null); } } @@ -1940,6 +1932,32 @@ public class NetInterfaceManager { }; } + private void setAppDisAble(List appAttrList) { + String appString = Settings.Global.getString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP); + if (!TextUtils.isEmpty(appString)) { + List pkgs = new ArrayList<>(Arrays.asList(appString.split(","))); + for (String pkg : pkgs) { + JGYUtils.getInstance().showApp(pkg); + } + } + + if (appAttrList == null || appAttrList.size() == 0) { + Log.e("getSnAppAttr", "onNext: appAttrList is empty"); + Settings.Global.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP, "null"); + } else { + for (AppAttr appAttr : appAttrList) { + if (appAttr.getIs_open() == 0) { + JGYUtils.getInstance().hideApp(appAttr.getApp_package()); + } + } + String disableApp = appAttrList.stream() + .filter(appAttr -> appAttr.getIs_open() == 0) + .map(AppAttr::getApp_package) + .collect(Collectors.joining(",")); + Log.e("getSnAppAttr", "onNext: disableApp = " + disableApp); + Settings.Global.putString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP, disableApp); + } + } public void setSystemSetting(boolean refresh, BehaviorSubject lifecycle, onCompleteCallback callback) { ConnectMode connectMode = ConnectMode.ONE_HOUR; @@ -2378,7 +2396,7 @@ public class NetInterfaceManager { JGYUtils.getInstance().setYxpDefaultDesktop(); } Settings.System.putInt(mContext.getContentResolver(), JGYActions.ACTION_QCH_UNLOCK_IPAD, JGYActions.FRAME_CODE_LOCKED); - Settings.System.putInt(mContext.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, 0); +// Settings.System.putInt(mContext.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, 0); } else if (locked == JGYActions.NET_CODE_UNLOCKED) { // SysSettingUtils.setEnableSetting(mContext); JGYUtils.getInstance().writeAppPackageList(); @@ -2626,6 +2644,8 @@ public class NetInterfaceManager { tagSets.add(JGYUtils.MT8768Tag); } else if (platform == JGYUtils.AUDG104Platform) { tagSets.add(JGYUtils.AUDG104Tag); + }else if (platform == JGYUtils.HL500Platform) { + tagSets.add(JGYUtils.HL500Tag); } }); Log.e(TAG, "clearAndAppendTags: " + tagSets); diff --git a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java index a4eeca8..78893e5 100644 --- a/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java +++ b/app/src/main/java/com/aoleyun/sn/network/interceptor/RepeatRequestInterceptor.java @@ -34,7 +34,7 @@ public class RepeatRequestInterceptor implements Interceptor { Response response = chain.proceed(request); ResponseBody responseBody = response.body(); - //会消费请求，导致请求多次 + //responseBody.string()消费了请求，就会导致多次请求。 String content = responseBody.string(); // Response copy = response.newBuilder().body(responseBody).build(); ResponseBody copy = ResponseBody.create(responseBody.contentType(), content); diff --git a/app/src/main/java/com/aoleyun/sn/push/PushManager.java b/app/src/main/java/com/aoleyun/sn/push/PushManager.java index 0d8f256..1c40ce7 100644 --- a/app/src/main/java/com/aoleyun/sn/push/PushManager.java +++ b/app/src/main/java/com/aoleyun/sn/push/PushManager.java @@ -899,7 +899,7 @@ public class PushManager { String allow = jSONObject.get("not").getAsString(); HashSet disallowApp = new HashSet<>(Arrays.asList(disallow.split(","))); HashSet allowApp = new HashSet<>(Arrays.asList(allow.split(","))); - JGYUtils.getInstance().setAppNetwork(mContext, disallowApp, allowApp); + JGYUtils.getInstance().setAppNetwork(disallowApp, allowApp); } private void settingPowerOn(String s) { diff --git a/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java b/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java index 5ddcf70..cfe734a 100644 --- a/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java +++ b/app/src/main/java/com/aoleyun/sn/receiver/NewAppReceiver.java @@ -105,7 +105,6 @@ public class NewAppReceiver extends BroadcastReceiver { Log.e("sendAppInfo", "onNext: " + s); // JGYUtils.getInstance().checkForceDownload(); NetInterfaceManager.getInstance().getForceDownload(); - JGYUtils.getInstance().updateNetworkWhiteList(); NetInterfaceManager.getInstance().getAppLimit(); NetInterfaceManager.getInstance().getDefaultDesktop(); NetInterfaceManager.getInstance().sendInstalledAppInfo(new NetInterfaceManager.onCompleteCallback() { @@ -147,7 +146,7 @@ public class NewAppReceiver extends BroadcastReceiver { @Override public void onNext(@NonNull String pkg) { Log.e("setLauncher", "onNext: " + pkg); - JGYUtils.getInstance().setAllowPermissionsPackage(mContext); + JGYUtils.getInstance().setAllowPermissionsPackage(); JGYUtils.getInstance().checkDefaultDesktop(pkg); String oldDesktop = JGYUtils.getInstance().getDefaultDesktop(); // String oldDesktop = (String) SPUtils.get(mContext, "default_launcher", ""); @@ -155,6 +154,7 @@ public class NewAppReceiver extends BroadcastReceiver { if (pkg.equals(oldDesktop)) { ApkUtils.openPackage(mContext, pkg); } + JGYUtils.getInstance().updateNetworkWhiteList(); } @Override diff --git a/app/src/main/java/com/aoleyun/sn/service/LogcatService.java b/app/src/main/java/com/aoleyun/sn/service/LogcatService.java index 89aa6c9..0e27b7c 100644 --- a/app/src/main/java/com/aoleyun/sn/service/LogcatService.java +++ b/app/src/main/java/com/aoleyun/sn/service/LogcatService.java @@ -33,9 +33,10 @@ import okhttp3.MultipartBody; import okhttp3.RequestBody; public class LogcatService extends Service { + private static final String TAG = "LogcatService"; + public final static String LOGCAT_START_ACTION = "START"; public final static String LOGCAT_STOP_ACTION = "STOP"; - private String TAG = "LogcatService"; public LogcatService() { diff --git a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java index a606dac..2c9bd8c 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java @@ -91,7 +91,6 @@ import java.util.Arrays; import java.util.Enumeration; import java.util.HashMap; import java.util.HashSet; -import java.util.LinkedHashSet; import java.util.List; import java.util.Map; import java.util.Set; @@ -147,6 +146,7 @@ public class JGYUtils { public static final int G11Platform = 16; public static final int MT8768Platform = 17; public static final int AUDG104Platform = 18; + public static final int HL500Platform = 20; public static final String Other = "其他"; @@ -165,6 +165,7 @@ public class JGYUtils { public static final String G11TAG = "MTKG11"; public static final String MT8768Tag = "MT8768"; public static final String AUDG104Tag = "AUDG104"; + public static final String HL500Tag = "HL500"; private CacheHelper cacheHelper; @@ -295,6 +296,9 @@ public class JGYUtils { } else if (AUDG104Tag.equalsIgnoreCase(platform)) { Log.i(TAG, "checkAppPlatform: " + "AUDG104"); return AUDG104Platform; + } else if (HL500Tag.equalsIgnoreCase(platform)) { + Log.i(TAG, "checkAppPlatform: " + "HL500"); + return HL500Platform; } else { Log.i(TAG, "checkAppPlatform: " + "没有数据"); return UnknowPlatform; @@ -347,6 +351,8 @@ public class JGYUtils { getAppPlatformCallback.AppPlatform(MT8768Platform); } else if (AUDG104Tag.equalsIgnoreCase(platform)) { getAppPlatformCallback.AppPlatform(AUDG104Platform); + } else if (HL500Tag.equalsIgnoreCase(platform)) { + getAppPlatformCallback.AppPlatform(HL500Platform); } else { getAppPlatformCallback.AppPlatform(UnknowPlatform); } @@ -600,7 +606,7 @@ public class JGYUtils { // boolean w = Settings.System.putString(crv, "aole_app_power_on", ""); // Log.e(TAG, "setNetAndlaunch: 测试写入: " + w); // } - setAppNetwork(mContext, disallowNetApp, allowNetApp); + setAppNetwork(disallowNetApp, allowNetApp); } public void onBootOpenApp() { @@ -740,10 +746,10 @@ public class JGYUtils { // boolean w = Settings.System.putString(crv, "aole_app_power_on", ""); // Log.e(TAG, "setNetAndlaunch: 测试写入: " + w); // } - setAppNetwork(mContext, disallowNetApp, allowNetApp); + setAppNetwork(disallowNetApp, allowNetApp); setDisallowNotificationPackage(mContext, disallowNotification); mMMKV.encode("aole_app_privilege", allowPermissions); - setAllowPermissionsPackage(mContext); + setAllowPermissionsPackage(); } private void setDisallowNotificationPackage(Context context, HashSet pkgSet) { @@ -755,62 +761,86 @@ public class JGYUtils { } } - public void setAllowPermissionsPackage(Context context) { + public void setAllowPermissionsPackage() { Set privilegeApp = mMMKV.decodeStringSet("aole_app_privilege", new HashSet<>()); Log.e(TAG, "setAllowPermissionsPackage: " + privilegeApp); Set pkgSet = privilegeApp.stream().filter(s -> ApkUtils.isAvailable(mContext, s)).collect(Collectors.toSet()); Log.e(TAG, "setAllowPermissionsPackage: " + pkgSet); if (pkgSet.size() == 0) { - Settings.System.putString(context.getContentResolver(), "aole_app_privilege", ""); + Settings.System.putString(crv, "aole_app_privilege", ""); } else { - Settings.System.putString(context.getContentResolver(), "aole_app_privilege", String.join(",", pkgSet)); + Settings.System.putString(crv, "aole_app_privilege", String.join(",", pkgSet)); } } - public void setAppNetwork(Context context, HashSet blackList, HashSet whiteList) { - ContentResolver contentResolver = context.getContentResolver(); + public void setAppNetwork(HashSet blackList, HashSet whiteList) { Log.e(TAG, "setAppNetwork: " + "设置应用联网管控 blackList =" + blackList); Log.e(TAG, "setAppNetwork: " + "设置应用联网管控 whiteList =" + whiteList); if (!MTK11Tag.equals(JGYUtils.getInstance().getAppPlatform())) { if (blackList == null || blackList.size() == 0) { - Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_DISALLOW, ""); + Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_DISALLOW, ""); } else { String net_not = String.join(",", blackList); - Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_DISALLOW, net_not); + Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_DISALLOW, net_not); Log.e(TAG, "setAppNetwork: " + net_not); } } mMMKV.encode(CommonConfig.AOLE_ACTION_NETWORK_ALLOW, whiteList); - - if (whiteList == null) { - whiteList = new HashSet<>(); + Set pkgs; + int is_app_install = Settings.System.getInt(crv, CommonConfig.AOLE_APP_ALLOW_INSTALL, 0); + if (is_app_install == 1) { + Log.e(TAG, "setAppNetwork: is_app_install = 1"); + pkgs = new HashSet<>(ApkUtils.queryFilterAppList(mContext)); + } else { + pkgs = new HashSet<>(whiteList); } - whiteList.add(BuildConfig.APPLICATION_ID); - whiteList.add("com.aoleyun.appstore"); + pkgs.add(BuildConfig.APPLICATION_ID); + pkgs.add("com.aoleyun.appstore"); + pkgs.add("com.aoleyun.camera"); + pkgs.add("com.aoleyun.calculator"); + pkgs.add("com.aoleyun.gallery3d"); + pkgs.addAll(ApkUtils.mJxwApp); - List filterList = whiteList.stream().filter(s -> ApkUtils.isAvailable(context, s)).collect(Collectors.toList()); + List filterList = pkgs.stream().filter(s -> ApkUtils.isAvailable(mContext, s)).collect(Collectors.toList()); Log.e(TAG, "setAppNetwork: filterList = " + filterList); if (filterList.size() == 0) { - Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, ""); + Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, ""); } else { - Settings.System.putString(contentResolver, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList)); + Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList)); } } + /** + * 应用安装之后添加到白名单 + */ public void updateNetworkWhiteList() { - Set pkgs = mMMKV.decodeStringSet(CommonConfig.AOLE_ACTION_NETWORK_ALLOW, new HashSet<>()); - if (pkgs.isEmpty()) { - Log.e(TAG, "updateNetworkWhiteList: allow content is empty"); - return; - } - List whiteList = new ArrayList<>(pkgs); - List filterList = whiteList.stream().filter(s -> ApkUtils.isAvailable(mContext, s)).collect(Collectors.toList()); - if (filterList.size() == 0) { - + Set pkgs; + int is_app_install = Settings.System.getInt(crv, CommonConfig.AOLE_APP_ALLOW_INSTALL, 0); + if (is_app_install == 1) { + Log.e(TAG, "updateNetworkWhiteList: is_app_install = 1"); + pkgs = new HashSet<>(ApkUtils.queryFilterAppList(mContext)); } else { + pkgs = mMMKV.decodeStringSet(CommonConfig.AOLE_ACTION_NETWORK_ALLOW, new HashSet<>()); + } + pkgs.add(BuildConfig.APPLICATION_ID); + pkgs.add("com.aoleyun.appstore"); + pkgs.add("com.aoleyun.camera"); + pkgs.add("com.aoleyun.calculator"); + pkgs.add("com.aoleyun.gallery3d"); + pkgs.addAll(ApkUtils.mJxwApp); + + List whiteList = new ArrayList<>(pkgs); + + List filterList = whiteList.stream().filter(s -> ApkUtils.isAvailable(mContext, s)).collect(Collectors.toList()); + Log.e(TAG, "updateNetworkWhiteList: filterList = " + filterList); + + if (filterList.size() == 0) { + Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, ""); + } else { + Settings.System.putString(crv, CommonConfig.AOLE_ACTION_NETWORK_ALLOW, String.join(",", filterList)); } Log.e(TAG, "updateNetworkWhiteList: " + filterList); } @@ -1551,8 +1581,15 @@ public class JGYUtils { } int aihuaUnlock = Settings.System.getInt(crv, CommonConfig.AIHUA_UNLOCK, 0); if (aihuaUnlock == 1) { + Log.e(TAG, "deleteOtherApp: aihuaUnlock"); return; } + int is_app_install = Settings.System.getInt(crv, CommonConfig.AOLE_APP_ALLOW_INSTALL, 0); + if (is_app_install == 1) { + Log.e(TAG, "deleteOtherApp: is_app_install = 1"); + return; + } + Log.e(TAG, "deleteOtherApp: " + "start"); String[] result_white = new String[]{}; String[] result_forbid = new String[]{}; @@ -3309,4 +3346,18 @@ public class JGYUtils { return info.applicationInfo.loadLabel(pm).toString(); } } + + /** + * @param pkg + * @return + */ + public boolean isHidedApp(String pkg) { + String appString = Settings.Global.getString(mContext.getContentResolver(), CommonConfig.AOLE_ACTION_DISABLE_APP); + if (TextUtils.isEmpty(appString)) { + return true; + } else { + List pkgs = new ArrayList<>(Arrays.asList(appString.split(","))); + return pkgs.contains(pkg); + } + } } diff --git a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java index 2073520..ee198ea 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/SysSettingUtils.java @@ -986,7 +986,8 @@ public class SysSettingUtils { } } int is_storeinstall = snSetting.getIs_storeinstall(); - Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, is_storeinstall); + // TODO: 2024/10/12 待更换为 AOLEYUN_APPSTORE_INSTALL + Settings.System.putInt(context.getContentResolver(), CommonConfig.AOLEYUN_APPSTORE_INSTALL, is_storeinstall); int is_usb = snSetting.getIs_usb(); setUsb(context, is_usb); int is_bluetooth_file = snSetting.getIs_bluetooth_file(); @@ -1008,7 +1009,7 @@ public class SysSettingUtils { if (null != c) { Log.e("getTimeControl", c.toString()); } - Settings.Global.putInt(context.getContentResolver(), CommonConfig.AOLE_APP_ALLOW_INSTALL, 1); + Settings.Global.putInt(context.getContentResolver(), CommonConfig.AOLEYUN_APPSTORE_INSTALL, 1); setUsb(context, 0); setBluetoothTransmission(context, 0); // JGYUtils.getInstance().setDeveloperOptions(0); diff --git a/app/src/main/java/com/aoleyun/sn/utils/Utils.java b/app/src/main/java/com/aoleyun/sn/utils/Utils.java index f8e29b2..82c6bac 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/Utils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/Utils.java @@ -795,6 +795,9 @@ public class Utils { * @return */ public static String getSerial(Context context) { + if ("HL500".equals(Build.MODEL)){ + return getIMEI(context); + } if (TECLAST_BRAND.equalsIgnoreCase(Build.BRAND)) { return getPushMac(context); } else { @@ -1782,6 +1785,7 @@ public class Utils { || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.G11Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.MT8768Platform || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.AUDG104Platform + || JGYUtils.getInstance().checkAppPlatform() == JGYUtils.HL500Platform ) { return Utils.getProperty("ro.build.display.id", "获取失败"); } else {