From ac627e53b1076450f3b826483dc6f1d9f8780f52 Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Wed, 26 Mar 2025 14:39:37 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BC=96=E8=AF=91=E5=8F=82=E6=95=B0=E9=85=8D?= =?UTF-8?q?=E7=BD=AE=E7=A1=AE=E5=AE=9A=EF=BC=8CLog=E5=88=86=E5=B1=8F?= =?UTF-8?q?=E6=B5=8B=E8=AF=95=E5=AE=8C=E6=88=90=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- appbase/build.gradle | 1 + appbase/build.properties | 4 ++-- appbase/src/main/AndroidManifest.xml | 9 +++++---- .../cc/winboll/studio/appbase/MainActivity.java | 16 +++++++++++++++- build.gradle | 2 +- libappbase/build.gradle | 8 ++++++++ libappbase/build.properties | 4 ++-- libappbase/src/main/AndroidManifest.xml | 7 ++++--- 8 files changed, 38 insertions(+), 13 deletions(-) diff --git a/appbase/build.gradle b/appbase/build.gradle index 4632155..5a0d1d3 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -18,6 +18,7 @@ def genVersionName(def versionName){ } android { + compileSdkVersion 32 buildToolsVersion "32.0.0" diff --git a/appbase/build.properties b/appbase/build.properties index c2ac156..d0d0416 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 17:54:33 GMT 2025 +#Wed Mar 26 06:37:55 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=76 +buildCount=89 baseBetaVersion=15.0.11 diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 9f60792..40fd259 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -16,10 +16,8 @@ android:resizeableActivity="true" android:launchMode="singleInstance" android:taskAffinity="cc.winboll.studio.appbase.task.main" - android:configChanges="screenSize|screenLayout|orientation" android:exported="true"> - @@ -38,6 +36,7 @@ @@ -64,7 +63,8 @@ - + @@ -94,7 +94,8 @@ - + diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java index 8624557..e685848 100644 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java +++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java @@ -1,8 +1,10 @@ package cc.winboll.studio.appbase; import android.app.Activity; +import android.app.ActivityOptions; import android.content.ComponentName; import android.content.Intent; +import android.graphics.Rect; import android.os.Bundle; import android.view.Menu; import android.view.MenuItem; @@ -176,6 +178,18 @@ public class MainActivity extends Activity implements IWinBollActivity { public void onLogActivity() { Intent intent = new Intent(MainActivity.this, LogActivity.class); intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT); - WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class); + // Define the bounds. + Rect bounds = new Rect(500, 300, 100, 0); + +// Set the bounds as an activity option. + + ActivityOptions options = ActivityOptions.makeBasic(); + + options.setLaunchBounds(bounds); + + //Intent intent = new Intent(this, LpgActivity.class); + + startActivity(intent, options.toBundle()); + //WinBollActivityManager.getInstance(this).startWinBollActivity(this, intent, LogActivity.class); } } diff --git a/build.gradle b/build.gradle index 491faab..2af2782 100644 --- a/build.gradle +++ b/build.gradle @@ -18,7 +18,7 @@ buildscript { mavenLocal() } dependencies { - classpath 'com.android.tools.build:gradle:7.2.1' + classpath 'com.android.tools.build:gradle:7.2.1' // 对应 compileSdkVersion 32 // NOTE: Do not place your application dependencies here; they belong // in the individual module build.gradle files } diff --git a/libappbase/build.gradle b/libappbase/build.gradle index 92cddde..571b164 100644 --- a/libappbase/build.gradle +++ b/libappbase/build.gradle @@ -4,6 +4,7 @@ apply from: '../.winboll/winboll_lib_build.gradle' apply from: '../.winboll/winboll_lint_build.gradle' android { + compileSdkVersion 32 buildToolsVersion "32.0.0" @@ -21,4 +22,11 @@ android { dependencies { api fileTree(dir: 'libs', include: ['*.jar']) + // AndroidX 类库 + api 'androidx.appcompat:appcompat:1.0.0' + api 'com.google.android.material:material:1.4.0' + //api 'androidx.viewpager:viewpager:1.0.0' + //api 'androidx.vectordrawable:vectordrawable:1.1.0' + //api 'androidx.vectordrawable:vectordrawable-animated:1.1.0' + //api 'androidx.fragment:fragment:1.1.0' } diff --git a/libappbase/build.properties b/libappbase/build.properties index c2ac156..d0d0416 100644 --- a/libappbase/build.properties +++ b/libappbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Mar 25 17:54:33 GMT 2025 +#Wed Mar 26 06:37:55 GMT 2025 stageCount=11 libraryProject=libappbase baseVersion=15.0 publishVersion=15.0.10 -buildCount=76 +buildCount=89 baseBetaVersion=15.0.11 diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml index b189cd6..d2ee0f2 100644 --- a/libappbase/src/main/AndroidManifest.xml +++ b/libappbase/src/main/AndroidManifest.xml @@ -27,7 +27,6 @@ android:resizeableActivity="true" android:launchMode="singleInstance" android:taskAffinity="cc.winboll.studio.libappbase.task.log" - android:configChanges="screenSize|screenLayout|orientation" android:exported="true"> @@ -42,7 +41,8 @@ android:name=".services.TestService" android:exported="true"/> - + @@ -84,7 +84,8 @@ - +