diff --git a/appbase/build.gradle b/appbase/build.gradle index 7d90452..b95d796 100644 --- a/appbase/build.gradle +++ b/appbase/build.gradle @@ -24,13 +24,13 @@ android { defaultConfig { applicationId "cc.winboll.studio.appbase" - minSdkVersion 21 + minSdkVersion 26 targetSdkVersion 30 versionCode 1 // versionName 更新后需要手动设置 // .winboll/winbollBuildProps.properties 文件的 stageCount=0 // Gradle编译环境下合起来的 versionName 就是 "${versionName}.0" - versionName "15.15" + versionName "15.20" if(true) { versionName = genVersionName("${versionName}") } diff --git a/appbase/build.properties b/appbase/build.properties index 4e84c0e..68642b1 100644 --- a/appbase/build.properties +++ b/appbase/build.properties @@ -1,8 +1,8 @@ #Created by .winboll/winboll_app_build.gradle -#Tue Apr 28 17:08:30 HKT 2026 -stageCount=22 +#Tue May 12 09:17:15 HKT 2026 +stageCount=10 libraryProject=libappbase -baseVersion=15.15 -publishVersion=15.15.21 +baseVersion=15.20 +publishVersion=15.20.9 buildCount=0 -baseBetaVersion=15.15.22 +baseBetaVersion=15.20.10 diff --git a/appbase/src/main/AndroidManifest.xml b/appbase/src/main/AndroidManifest.xml index 5549b71..4c0df09 100644 --- a/appbase/src/main/AndroidManifest.xml +++ b/appbase/src/main/AndroidManifest.xml @@ -9,7 +9,9 @@ android:label="@string/app_name" android:theme="@style/MyAPPBaseTheme" android:resizeableActivity="true" - android:process=":App"> + android:process=":App" + android:sharedUserId="@string/shared_user_id" + android:sharedUserLabel="@string/shared_user_label"> - - - - - - - - + + = 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-night/activity_about.xml b/appbase/src/main/res/layout-night/activity_about.xml new file mode 100644 index 0000000..f8af6b0 --- /dev/null +++ b/appbase/src/main/res/layout-night/activity_about.xml @@ -0,0 +1,22 @@ + + + + + + + + \ No newline at end of file diff --git a/appbase/src/main/res/layout-night/activity_main.xml b/appbase/src/main/res/layout-night/activity_main.xml new file mode 100644 index 0000000..383caad --- /dev/null +++ b/appbase/src/main/res/layout-night/activity_main.xml @@ -0,0 +1,106 @@ + + + + + + + + + +