diff --git a/winboll/build.gradle b/winboll/build.gradle index d536381..4999551 100644 --- a/winboll/build.gradle +++ b/winboll/build.gradle @@ -18,10 +18,14 @@ def genVersionName(def versionName){ } android { - // 适配MIUI12 - compileSdkVersion 30 - buildToolsVersion "30.0.3" - + // 适配MIUI12 + compileSdkVersion 30 + + compileOptions { + sourceCompatibility JavaVersion.VERSION_1_7 + targetCompatibility JavaVersion.VERSION_1_7 + } + defaultConfig { applicationId "cc.winboll.studio.winboll" minSdkVersion 26 @@ -39,7 +43,6 @@ android { } dependencies { - api project(':libwinboll') api 'com.google.code.gson:gson:2.10.1' // 下拉控件 @@ -97,8 +100,8 @@ dependencies { implementation 'androidx.biometric:biometric:1.1.0' // WinBoLL库 nexus.winboll.cc 地址 - api 'cc.winboll.studio:libappbase:15.20.33' - api 'cc.winboll.studio:libaes:15.20.16' + api 'cc.winboll.studio:libappbase:15.20.34' + api 'cc.winboll.studio:libaes:15.20.17' // 备用库 jitpack.io 地址 //api 'com.github.ZhanGSKen:libappbase:appbase-v15.20.33' diff --git a/winboll/build.properties b/winboll/build.properties index 1a600ca..8618fe9 100644 --- a/winboll/build.properties +++ b/winboll/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Wed Jun 24 08:11:15 CST 2026 +#Wed Jul 01 14:49:57 CST 2026 stageCount=9 -libraryProject=libwinboll +libraryProject= baseVersion=15.20 publishVersion=15.20.8 -buildCount=0 +buildCount=16 baseBetaVersion=15.20.9 diff --git a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java index 7f34285..da137ee 100644 --- a/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java +++ b/winboll/src/main/java/cc/winboll/studio/winboll/MainActivity.java @@ -193,9 +193,7 @@ public class MainActivity extends DrawerFragmentActivity { } else if (nItemId == R.id.item_termux_env_test) { Intent intent = new Intent(getApplicationContext(), TermuxEnvTestActivity.class); WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); - } else if (nItemId == R.id.item_library_activity) { - Intent intent = new Intent(getApplicationContext(), cc.winboll.studio.libwinboll.WinBoLLLibraryActivity.class); - WinBoLLActivityManager.getInstance().startWinBoLLActivity(getApplicationContext(), intent, AboutActivity.class); + } else { return super.onOptionsItemSelected(item); } diff --git a/winboll/src/main/res/layout/activity_settings.xml b/winboll/src/main/res/layout/activity_settings.xml index b0da872..a81971c 100644 --- a/winboll/src/main/res/layout/activity_settings.xml +++ b/winboll/src/main/res/layout/activity_settings.xml @@ -11,10 +11,11 @@ android:layout_height="wrap_content" android:id="@+id/toolbar"/> - + +