From 9665856b1b7cbeec5329182e10b786729de59643 Mon Sep 17 00:00:00 2001 From: LaizyBoy Date: Sun, 10 May 2026 03:50:12 +0800 Subject: [PATCH] =?UTF-8?q?=E7=AE=80=E5=8C=96=E5=BA=94=E7=94=A8=E5=90=AF?= =?UTF-8?q?=E5=8A=A8=E7=AA=97=E5=8F=A3=E9=85=8D=E7=BD=AE=EF=BC=9A=E7=A7=BB?= =?UTF-8?q?=E9=99=A4=E5=88=86=E5=B1=8F=E6=B5=8B=E8=AF=95=E5=8A=9F=E8=83=BD?= =?UTF-8?q?=EF=BC=8CMainActivity=20=E8=AE=BE=E4=B8=BA=E5=94=AF=E4=B8=80?= =?UTF-8?q?=E5=90=AF=E5=8A=A8=E5=99=A8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - 删除 MainActivityAlias 分屏窗口类及相关文件 - 移除 AndroidManifest 中的 MainActivityAlias activity 声明 - 从 activity_main.xml 移除分屏测试按钮 - 删除 MainActivity 中的 onSplitScreenMode() 方法 - 为 MainActivity 添加 LAUNCHER intent-filter，作为唯一启动主窗口 --- appbase/build.properties | 4 ++-- appbase/src/main/AndroidManifest.xml | 16 ++------------- .../winboll/studio/appbase/MainActivity.java | 20 +------------------ .../studio/appbase/MainActivityAlias.java | 17 ---------------- appbase/src/main/res/layout/activity_main.xml | 12 +---------- libappbase/build.properties | 4 ++-- 6 files changed, 8 insertions(+), 65 deletions(-) delete mode 100644 appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java diff --git a/appbase/build.properties b/appbase/build.properties index c743abb..b384f12 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Sat May 09 20:50:12 HKT 2026 +#Sun May 10 03:46:22 CST 2026 stageCount=23 libraryProject=libappbase baseVersion=15.15 publishVersion=15.15.22 -buildCount=0 +buildCount=5 baseBetaVersion=15.15.23 diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 5549b71..b7ea9d9 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -19,28 +19,16 @@ android:launchMode="singleTop" android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"> - - - - - - - - + + = android.os.Build.VERSION_CODES.N) { - android.graphics.Rect bounds = new android.graphics.Rect(); - getWindow().getDecorView().getDisplay().getRectSize(bounds); - int height = bounds.height(); - int width = bounds.width(); - bounds.set(0, 0, width, height / 2); - LogUtils.d(TAG, "onSplitScreenMode() 分屏窗口范围: " + bounds); - android.content.Intent intent = new android.content.Intent(this, MainActivityAlias.class); - intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK); - LogUtils.d(TAG, "onSplitScreenMode() 准备启动MainActivityAlias"); - android.app.ActivityOptions options = android.app.ActivityOptions.makeBasic(); - options.setLaunchBounds(bounds); - startActivity(intent, options.toBundle()); - LogUtils.d(TAG, "onSplitScreenMode() MainActivityAlias已启动"); - } - } + public void onMultiInstance(View view) { LogUtils.d(TAG, "onMultiInstance() 多开窗口按钮已点击"); diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java deleted file mode 100644 index 776a0f0..0000000 --- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivityAlias.java +++ /dev/null @@ -1,17 +0,0 @@ -package cc.winboll.studio.appbase; - -import android.os.Bundle; -import android.view.View; -import android.widget.Toolbar; -import cc.winboll.studio.appbase.R; - -public class MainActivityAlias extends MainActivity { - - @Override - protected void onCreate(Bundle savedInstanceState) { - super.onCreate(savedInstanceState); - setContentView(R.layout.activity_main); - Toolbar toolbar = findViewById(R.id.toolbar); - setActionBar(toolbar); - } -} \ No newline at end of file diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml index d7a5e0b..50a2619 100644 --- a/appbase/src/main/res/layout/activity_main.xml +++ b/appbase/src/main/res/layout/activity_main.xml @@ -83,17 +83,7 @@ android:onClick="onToastUtilsTest" android:layout_margin="10dp"/> -