From bfaf3543b939cbd29ccfb8e0e96400e599258259 Mon Sep 17 00:00:00 2001
From: ZhanGSKen <zhangsken@qq.com>
Date: Mon, 27 Apr 2026 20:01:44 +0800
Subject: [PATCH] =?UTF-8?q?=E6=B7=BB=E5=8A=A0=E5=A4=9A=E7=AA=97=E5=8F=A3?=
 =?UTF-8?q?=E6=94=AF=E6=8C=81=E4=B8=8ELogActivity=E7=8B=AC=E7=AB=8B?=
 =?UTF-8?q?=E4=BB=BB=E5=8A=A1=E6=A0=88?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 appbase/build.properties                      |  4 ++--
 appbase/src/main/AndroidManifest.xml          | 11 ++++++++++
 .../winboll/studio/appbase/Main2Activity.java | 20 +++++++++++++++++++
 .../winboll/studio/appbase/MainActivity.java  | 10 ++++++++++
 appbase/src/main/res/layout/activity_main.xml | 12 +++++++++++
 .../src/main/res/layout/activity_main2.xml    | 17 ++++++++++++++++
 libappbase/build.properties                   |  4 ++--
 libappbase/src/main/AndroidManifest.xml       |  3 ++-
 .../studio/libappbase/LogActivity.java        |  5 +----
 9 files changed, 77 insertions(+), 9 deletions(-)
 create mode 100644 appbase/src/main/java/cc/winboll/studio/appbase/Main2Activity.java
 create mode 100644 appbase/src/main/res/layout/activity_main2.xml

diff --git a/appbase/build.properties b/appbase/build.properties
index d0c8db3..d7bab7b 100644
--- a/appbase/build.properties
+++ b/appbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Apr 27 19:22:37 CST 2026
+#Mon Apr 27 19:57:40 CST 2026
 stageCount=20
 libraryProject=libappbase
 baseVersion=15.15
 publishVersion=15.15.19
-buildCount=26
+buildCount=34
 baseBetaVersion=15.15.20
diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml
index ce1e068..5549b71 100644
--- a/appbase/src/main/AndroidManifest.xml
+++ b/appbase/src/main/AndroidManifest.xml
@@ -41,6 +41,17 @@
 
         </activity>
 
+        <activity
+            android:name=".Main2Activity"
+            android:label="@string/app_name"
+            android:exported="true"
+            android:resizeableActivity="true"
+            android:launchMode="singleTop"
+            android:taskAffinity="cc.winboll.studio.appbase.Main2Activity"
+            android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation">
+
+        </activity>
+
         <activity android:name=".GlobalApplication$CrashActivity"/>
 
         <meta-data
diff --git a/appbase/src/main/java/cc/winboll/studio/appbase/Main2Activity.java b/appbase/src/main/java/cc/winboll/studio/appbase/Main2Activity.java
new file mode 100644
index 0000000..1b989f7
--- /dev/null
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/Main2Activity.java
@@ -0,0 +1,20 @@
+package cc.winboll.studio.appbase;
+
+import android.os.Bundle;
+import android.widget.Toolbar;
+import cc.winboll.studio.appbase.R;
+
+public class Main2Activity extends MainActivity {
+
+    public static final String TAG = "Main2Activity";
+
+    @Override
+    protected void onCreate(Bundle savedInstanceState) {
+        super.onCreate(savedInstanceState);
+        setContentView(R.layout.activity_main2);
+        Toolbar toolbar = findViewById(R.id.toolbar);
+        if (toolbar != null) {
+            setActionBar(toolbar);
+        }
+    }
+}
\ No newline at end of file
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 a838651..e524154 100644
--- a/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
+++ b/appbase/src/main/java/cc/winboll/studio/appbase/MainActivity.java
@@ -181,5 +181,15 @@ public class MainActivity extends Activity {
             LogUtils.d(TAG, "onSplitScreenMode() MainActivityAlias已启动");
         }
     }
+
+	public void onMultiInstance(View view) {
+        LogUtils.d(TAG, "onMultiInstance() 多开窗口按钮已点击");
+        ToastUtils.show("多开窗口：已启动新窗口");
+        android.content.Intent intent = new android.content.Intent(this, Main2Activity.class);
+        intent.setFlags(android.content.Intent.FLAG_ACTIVITY_NEW_TASK);
+        LogUtils.d(TAG, "onMultiInstance() 准备启动Main2Activity");
+        startActivity(intent);
+        LogUtils.d(TAG, "onMultiInstance() Main2Activity已启动");
+    }
 }
 
diff --git a/appbase/src/main/res/layout/activity_main.xml b/appbase/src/main/res/layout/activity_main.xml
index 6835440..7da0450 100644
--- a/appbase/src/main/res/layout/activity_main.xml
+++ b/appbase/src/main/res/layout/activity_main.xml
@@ -95,6 +95,18 @@
 				android:onClick="onSplitScreenMode"
 				android:layout_margin="10dp"/>
 
+			<Button
+				android:layout_width="match_parent"
+				android:layout_height="wrap_content"
+				android:text="多开窗口"
+				android:textSize="16sp"
+				android:textColor="@android:color/white"
+				android:background="#81C7F5"
+				android:paddingVertical="12dp"
+				android:layout_marginHorizontal="24dp"
+				android:onClick="onMultiInstance"
+				android:layout_margin="10dp"/>
+
 		</LinearLayout>
 
 	</ScrollView>
diff --git a/appbase/src/main/res/layout/activity_main2.xml b/appbase/src/main/res/layout/activity_main2.xml
new file mode 100644
index 0000000..7a96c0c
--- /dev/null
+++ b/appbase/src/main/res/layout/activity_main2.xml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="utf-8"?>
+<LinearLayout
+	xmlns:android="http://schemas.android.com/apk/res/android"
+	android:orientation="vertical"
+	android:layout_width="match_parent"
+	android:layout_height="match_parent"
+	android:gravity="center"
+	android:background="@android:color/white">
+
+	<TextView
+		android:layout_width="wrap_content"
+		android:layout_height="wrap_content"
+		android:text="Main2Activity"
+		android:textSize="24sp"
+		android:textColor="@color/gray_900"/>
+
+</LinearLayout>
\ No newline at end of file
diff --git a/libappbase/build.properties b/libappbase/build.properties
index d0c8db3..d7bab7b 100644
--- a/libappbase/build.properties
+++ b/libappbase/build.properties
@@ -1,8 +1,8 @@
 #Created by .winboll/winboll_app_build.gradle
-#Mon Apr 27 19:22:37 CST 2026
+#Mon Apr 27 19:57:40 CST 2026
 stageCount=20
 libraryProject=libappbase
 baseVersion=15.15
 publishVersion=15.15.19
-buildCount=26
+buildCount=34
 baseBetaVersion=15.15.20
diff --git a/libappbase/src/main/AndroidManifest.xml b/libappbase/src/main/AndroidManifest.xml
index d0c99f8..f2838e6 100644
--- a/libappbase/src/main/AndroidManifest.xml
+++ b/libappbase/src/main/AndroidManifest.xml
@@ -37,7 +37,8 @@
             android:resizeableActivity="true"
             android:configChanges="screenSize|smallestScreenSize|screenLayout|orientation"
             android:exported="true"
-            android:launchMode="singleTop"
+            android:launchMode="singleInstance"
+            android:taskAffinity="cc.winboll.studio.libappbase.LogActivity"
             android:process=":LogActivity">
 
         </activity>
diff --git a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogActivity.java b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogActivity.java
index 1a9ca4f..8c0e5af 100644
--- a/libappbase/src/main/java/cc/winboll/studio/libappbase/LogActivity.java
+++ b/libappbase/src/main/java/cc/winboll/studio/libappbase/LogActivity.java
@@ -59,16 +59,14 @@ public class LogActivity extends Activity {
      */
     public static void startLogActivity(Context context, boolean newTask) {
         Intent intent = new Intent(context, LogActivity.class);
-        intent.setFlags(0);
+        intent.setFlags(Intent.FLAG_ACTIVITY_NEW_TASK | Intent.FLAG_ACTIVITY_CLEAR_TOP);
 
         if (newTask) {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
             context.startActivity(intent);
         } else if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.N) {
             intent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT);
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             intent.addFlags(Intent.FLAG_ACTIVITY_NEW_DOCUMENT);
             intent.addFlags(Intent.FLAG_ACTIVITY_MULTIPLE_TASK);
 
@@ -82,7 +80,6 @@ public class LogActivity extends Activity {
             options.setLaunchBounds(bounds);
             context.startActivity(intent, options.toBundle());
         } else {
-            intent.addFlags(Intent.FLAG_ACTIVITY_NEW_TASK);
             context.startActivity(intent);
         }
     }