From 5f3b3f51a0cdef5a4ead42abb3cf59fd23c2a318 Mon Sep 17 00:00:00 2001 From: tongtongstudio Date: Fri, 10 Dec 2021 14:29:55 +0800 Subject: [PATCH] =?UTF-8?q?version:1.6=20fix:=E4=BF=AE=E5=A4=8D=E6=B5=8F?= =?UTF-8?q?=E8=A7=88=E5=99=A8=E6=9B=B4=E6=96=B0=20add:?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- app/build.gradle | 33 ++++++++++--------- .../aoleyun/sn/activity/SplashActivity.java | 16 +++++++-- .../com/aoleyun/sn/comm/PackageNames.java | 2 +- .../java/com/aoleyun/sn/utils/ApkUtils.java | 2 +- .../java/com/aoleyun/sn/utils/JGYUtils.java | 1 + build.gradle | 2 +- 6 files changed, 35 insertions(+), 21 deletions(-) diff --git a/app/build.gradle b/app/build.gradle index 815045e..cbd2a03 100644 --- a/app/build.gradle +++ b/app/build.gradle @@ -9,19 +9,20 @@ def releaseTime() { } android { - gradle.projectsEvaluated { - tasks.withType(JavaCompile) { - Set fileSet = options.bootstrapClasspath.getFiles() - List newFileList = new ArrayList<>(); - //JAVA语法，可连续调用，输入参数建议为相对路径 - newFileList.add(new File("libs/framework.jar")) - //最后将原始参数添加 - newFileList.addAll(fileSet) - options.bootstrapClasspath = files( - newFileList.toArray() - ) - } - } + //Android Studio 4.0 之后使用这个，但是会把jar打包进apk +// gradle.projectsEvaluated { +// tasks.withType(JavaCompile) { +// Set fileSet = options.bootstrapClasspath.getFiles() +// List newFileList = new ArrayList<>(); +// //JAVA语法，可连续调用，输入参数建议为相对路径 +// newFileList.add(new File("libs/framework.jar")) +// //最后将原始参数添加 +// newFileList.addAll(fileSet) +// options.bootstrapClasspath = files( +// newFileList.toArray() +// ) +// } +// } compileSdkVersion 29 buildToolsVersion "30.0.3" @@ -58,8 +59,8 @@ android { //新平台正式 newly { flavorDimensions "default" - versionCode 5 - versionName "1.4" + versionCode 7 + versionName "1.6" /*********************************极光推送************************************/ manifestPlaceholders = [ JPUSH_PKGNAME: "com.aoleyun.sn", @@ -280,7 +281,7 @@ android { } dependencies { - implementation fileTree(dir: "libs", include: ["*.jar"]) +// implementation fileTree(dir: "libs", include: ["*.jar"]) compileOnly files('libs/framework.jar') implementation 'androidx.appcompat:appcompat:1.3.1' diff --git a/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java b/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java index 5e11fe4..62d4e3a 100644 --- a/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java +++ b/app/src/main/java/com/aoleyun/sn/activity/SplashActivity.java @@ -101,7 +101,19 @@ public class SplashActivity extends AppCompatActivity { } private void debugTest() { - if (!BuildConfig.DEBUG) return; +// if (!BuildConfig.DEBUG) return; +// File file = new File("/system/media/bootanimation2.zip"); +// if (file.exists()){ +// Log.e(TAG, "debugTest: "+"file.exists" ); +// }else { +// Log.e(TAG, "debugTest: "+"file not exists" ); +// } +// if (file.delete()){ +// Log.e(TAG, "debugTest: "+"file.delete" ); +// }else { +// Log.e(TAG, "debugTest: "+"file delete failed" ); +// } + // Utils.getHardware(this); // setWebView(); // hideStatusBar(); @@ -111,7 +123,7 @@ public class SplashActivity extends AppCompatActivity { String only_jgy_shortcut_list = Settings.System.getString(getContentResolver(), JGYActions.ACTION_JGY_SHORTCUTLIST); Log.i(TAG, "debugTest: only_jgy_shortcut_list:" + only_jgy_shortcut_list); String qch_app_forbid = Settings.System.getString(getContentResolver(), "qch_app_forbid"); - Settings.System.putString(getContentResolver(), "qch_app_forbid", qch_app_forbid + ",com.uiui.browser"); + Settings.System.putString(getContentResolver(), "qch_app_forbid", qch_app_forbid + ",com.aoleyun.browser"); Log.e(TAG, "debugTest: qch_app_forbid:" + qch_app_forbid); Log.i(TAG, "debugTest: ip = " + JGYUtils.getInstance().getIPAddress()); Log.i(TAG, "debugTest: getPackage = " + Utils.getPackage()); diff --git a/app/src/main/java/com/aoleyun/sn/comm/PackageNames.java b/app/src/main/java/com/aoleyun/sn/comm/PackageNames.java index 40b9182..47e5677 100644 --- a/app/src/main/java/com/aoleyun/sn/comm/PackageNames.java +++ b/app/src/main/java/com/aoleyun/sn/comm/PackageNames.java @@ -16,7 +16,7 @@ public class PackageNames { public static final String APPSTORE = "com.aoleyun.appstore"; public static final String DESKTOP = "com.aoleyun.os"; public static final String NOTIFICATIONS = "com.aoleyun.info"; - public static final String BROWSER = "com.uiui.browser"; + public static final String BROWSER = "com.aoleyun.browser"; public static final String APP_STORE_BOOTRECEIVER = "com.aoleyun.appstore.receiver.BootReceiver"; } diff --git a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java index 3453124..0f8fbd1 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/ApkUtils.java @@ -767,7 +767,7 @@ public class ApkUtils { this.add("com.aoleyun.sn"); this.add("com.aoleyun.info"); this.add("com.aoleyun.os"); - this.add("com.uiui.browser"); + this.add("com.aoleyun.browser"); }}; //出厂自带的app 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 3ab02cd..ac8bf53 100644 --- a/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java +++ b/app/src/main/java/com/aoleyun/sn/utils/JGYUtils.java @@ -931,6 +931,7 @@ public class JGYUtils { this.add("com.uiuios.jgy1"); this.add("com.uiuios.jgy2"); this.add("com.tt.ttutils"); + this.add("com.aoleyun.browser"); this.add("com.uiui.browser"); this.add("com.android.uiuios"); this.add("com.aoleyun.os"); diff --git a/build.gradle b/build.gradle index 92d9aa0..396b405 100644 --- a/build.gradle +++ b/build.gradle @@ -28,7 +28,7 @@ allprojects { } gradle.projectsEvaluated { tasks.withType(JavaCompile) { - options.compilerArgs.add('-Xbootclasspath/p:libs/framework.jar') + options.compilerArgs.add('-Xbootclasspath/p:app/libs/framework.jar') } } }