From 8963d2a5dfcebff1e279f2a675d8dffcf21c3f0c Mon Sep 17 00:00:00 2001 From: ZhanGSKen Date: Fri, 26 Sep 2025 19:43:06 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=97=A5=E5=BF=97=E5=88=9D?= =?UTF-8?q?=E5=A7=8B=E5=88=86=E5=B1=8F=E6=AF=94=E4=BE=8B=E6=97=A0=E6=B3=95?= =?UTF-8?q?=E8=B0=83=E8=8A=82=E9=97=AE=E9=A2=98=E3=80=82=E5=8E=9F=E5=9B=A0?= =?UTF-8?q?=E6=98=AF=E4=B8=A4=E4=B8=AA=E7=AA=97=E5=8F=A3=E9=83=BD=E5=AD=98?= =?UTF-8?q?=E5=9C=A8LogView=E6=8E=A7=E4=BB=B6=E6=97=B6=EF=BC=8C=E4=BC=9A?= =?UTF-8?q?=E5=BC=95=E8=B5=B7=E6=9C=AA=E7=9F=A5=E5=8E=9F=E5=9B=A0=E7=9A=84?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E8=B0=83=E8=8A=82=E9=97=AE=E9=A2=98=E3=80=82?= =?UTF-8?q?=E5=8F=AA=E8=A6=81=E5=90=AF=E5=8A=A8=E7=AA=97=E5=8F=A3=E6=8A=8A?= =?UTF-8?q?LogView=E6=8E=A7=E4=BB=B6=E7=A7=BB=E9=99=A4=E5=B0=B1=E5=8F=AF?= =?UTF-8?q?=E4=BB=A5=E4=BA=86=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- apputils/build.properties | 4 +-- apputils/src/main/AndroidManifest.xml | 4 +-- .../winboll/studio/apputils/MainActivity.java | 26 ++++++++++++++----- .../src/main/res/layout/activity_main.xml | 7 ----- libapputils/build.properties | 4 +-- 5 files changed, 26 insertions(+), 19 deletions(-) diff --git a/apputils/build.properties b/apputils/build.properties index c1c21a2..5f8cc1e 100644 --- a/apputils/build.properties +++ b/apputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Sep 22 08:19:44 HKT 2025 +#Fri Sep 26 11:39:46 GMT 2025 stageCount=1 libraryProject=libapputils baseVersion=15.9 publishVersion=15.9.0 -buildCount=0 +buildCount=7 baseBetaVersion=15.9.1 diff --git a/apputils/src/main/AndroidManifest.xml b/apputils/src/main/AndroidManifest.xml index 3f5b35f..a7e0389 100644 --- a/apputils/src/main/AndroidManifest.xml +++ b/apputils/src/main/AndroidManifest.xml @@ -14,14 +14,14 @@ android:theme="@style/MyUtilsTheme" android:supportsRtl="true" android:resizeableActivity="true" + android:screenOrientation="unspecified" android:requestLegacyExternalStorage="true"> + android:exported="true"> diff --git a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java index ae43fb4..3f89366 100644 --- a/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java +++ b/apputils/src/main/java/cc/winboll/studio/apputils/MainActivity.java @@ -27,21 +27,21 @@ final public class MainActivity extends Activity { public static final int REQUEST_QRCODEDECODE_ACTIVITY = 0; Toolbar mToolbar; - LogView mLogView; + //LogView mLogView; // // @Override // public Activity getActivity() { // return this; // } - + @Override protected void onCreate(Bundle savedInstanceState) { super.onCreate(savedInstanceState); setContentView(R.layout.activity_main); - mLogView = findViewById(R.id.logview); - mLogView.start(); +// mLogView = findViewById(R.id.logview); +// mLogView.start(); // 初始化工具栏 mToolbar = findViewById(R.id.toolbar); @@ -146,6 +146,20 @@ final public class MainActivity extends Activity { } public void onTestLogActivity(View view) { + /* 分屏代码有效 + // 1. 创建启动 SecondActivity 的 Intent + Intent splitIntent = new Intent(MainActivity.this, LogActivity.class); + + // 2. 添加分屏启动必需的两个标志（API 30 兼容） + // FLAG_ACTIVITY_LAUNCH_ADJACENT：相邻分屏显示 + // FLAG_ACTIVITY_NEW_TASK：分屏需要新任务栈 + splitIntent.addFlags(Intent.FLAG_ACTIVITY_LAUNCH_ADJACENT + | Intent.FLAG_ACTIVITY_NEW_TASK); + + // 3. 启动分屏活动（若设备不支持分屏，会默认全屏启动） + startActivity(splitIntent); + */ + LogActivity.startLogActivity(this); } @@ -262,7 +276,7 @@ final public class MainActivity extends Activity { // } } - + public void onTestAssetsHtmlActivity(View view) { Intent intent = new Intent(this, AssetsHtmlActivity.class); intent.putExtra(AssetsHtmlActivity.EXTRA_HTMLFILENAME, "javascript_test.html"); @@ -275,7 +289,7 @@ final public class MainActivity extends Activity { @Override protected void onResume() { super.onResume(); - mLogView.start(); + //mLogView.start(); } /*@Override diff --git a/apputils/src/main/res/layout/activity_main.xml b/apputils/src/main/res/layout/activity_main.xml index 7a07e44..802ac58 100644 --- a/apputils/src/main/res/layout/activity_main.xml +++ b/apputils/src/main/res/layout/activity_main.xml @@ -54,13 +54,6 @@ - - diff --git a/libapputils/build.properties b/libapputils/build.properties index 78de513..5f8cc1e 100644 --- a/libapputils/build.properties +++ b/libapputils/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Mon Sep 22 08:17:49 HKT 2025 +#Fri Sep 26 11:39:46 GMT 2025 stageCount=1 libraryProject=libapputils baseVersion=15.9 publishVersion=15.9.0 -buildCount=0 +buildCount=7 baseBetaVersion=15.9.1